mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-19 10:22:23 +00:00
* add core/rawdb/accessors_row_consumption.go * update core/rawdb/schema.go * update eth/ethconfig/config.go * update eth/ethconfig/gen_config.go * update miner/miner.go * update eth/backend.go * update core/types.go * update cmd/geth/main.go * update cmd/utils/flags.go * update core/types/block.go * update core/block_validator.go * WIP: update miner/worker.go * WIP: update miner/worker.go * WIP: update miner/worker.go * WIP: update miner/worker.go * WIP: update miner/worker.go * WIP: update miner/worker.go add withTimer * WIP: update miner/worker.go * WIP: update miner/worker.go add some func * WIP: update miner/worker.go `makeEnv` * fix * fix * minor * init traces return * init accRows * update `applyTransaction` * fix `TestPriorityClient` * miner: update metrics * minor * add `l2CommitTxTraceStateRevertTimer` * update `calcAndSetAccRowsForEnv` * start to work on `commitTransactions` * seal block early if we're over time * If we have collected enough transactions then we're done * check L1 message queue index * A single L1 message leads to out-of-gas * more on nil err * more error * skip RemoveTx for now * minor * l1TxStrangeErr * fix interface * start to work on `commitWork` * minor * draft `fillTransactions` * fix some types * refactor * fix * add `circuitCapacityReached` * minor * fix `txToLazyTx` * fix `(m *mockBackend) ChainDb()` * fix `removeTx` * update comments
205 lines
6.5 KiB
Go
205 lines
6.5 KiB
Go
// Copyright 2014 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
package miner
|
|
|
|
import (
|
|
"container/heap"
|
|
"fmt"
|
|
"math/big"
|
|
"sort"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/common/math"
|
|
"github.com/ethereum/go-ethereum/core/txpool"
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
"github.com/ethereum/go-ethereum/log"
|
|
)
|
|
|
|
// txWithMinerFee wraps a transaction with its gas price or effective miner gasTipCap
|
|
type txWithMinerFee struct {
|
|
tx *txpool.LazyTransaction
|
|
from common.Address
|
|
fees *big.Int
|
|
}
|
|
|
|
// newTxWithMinerFee creates a wrapped transaction, calculating the effective
|
|
// miner gasTipCap if a base fee is provided.
|
|
// Returns error in case of a negative effective miner gasTipCap.
|
|
func newTxWithMinerFee(tx *txpool.LazyTransaction, from common.Address, baseFee *big.Int) (*txWithMinerFee, error) {
|
|
tip := new(big.Int).Set(tx.GasTipCap)
|
|
if baseFee != nil {
|
|
if tx.GasFeeCap.Cmp(baseFee) < 0 {
|
|
return nil, types.ErrGasFeeCapTooLow
|
|
}
|
|
tip = math.BigMin(tx.GasTipCap, new(big.Int).Sub(tx.GasFeeCap, baseFee))
|
|
}
|
|
return &txWithMinerFee{
|
|
tx: tx,
|
|
from: from,
|
|
fees: tip,
|
|
}, nil
|
|
}
|
|
|
|
// txByPriceAndTime implements both the sort and the heap interface, making it useful
|
|
// for all at once sorting as well as individually adding and removing elements.
|
|
type txByPriceAndTime []*txWithMinerFee
|
|
|
|
func (s txByPriceAndTime) Len() int { return len(s) }
|
|
func (s txByPriceAndTime) Less(i, j int) bool {
|
|
// If the prices are equal, use the time the transaction was first seen for
|
|
// deterministic sorting
|
|
cmp := s[i].fees.Cmp(s[j].fees)
|
|
if cmp == 0 {
|
|
return s[i].tx.Time.Before(s[j].tx.Time)
|
|
}
|
|
return cmp > 0
|
|
}
|
|
func (s txByPriceAndTime) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
|
|
|
|
func (s *txByPriceAndTime) Push(x interface{}) {
|
|
*s = append(*s, x.(*txWithMinerFee))
|
|
}
|
|
|
|
func (s *txByPriceAndTime) Pop() interface{} {
|
|
old := *s
|
|
n := len(old)
|
|
x := old[n-1]
|
|
old[n-1] = nil
|
|
*s = old[0 : n-1]
|
|
return x
|
|
}
|
|
|
|
// transactionsByPriceAndNonce represents a set of transactions that can return
|
|
// transactions in a profit-maximizing sorted order, while supporting removing
|
|
// entire batches of transactions for non-executable accounts.
|
|
type transactionsByPriceAndNonce struct {
|
|
txs map[common.Address][]*txpool.LazyTransaction // Per account nonce-sorted list of transactions
|
|
heads txByPriceAndTime // Next transaction for each unique account (price heap)
|
|
signer types.Signer // Signer for the set of transactions
|
|
baseFee *big.Int // Current base fee
|
|
}
|
|
|
|
// newTransactionsByPriceAndNonce creates a transaction set that can retrieve
|
|
// price sorted transactions in a nonce-honouring way.
|
|
//
|
|
// Note, the input map is reowned so the caller should not interact any more with
|
|
// if after providing it to the constructor.
|
|
func newTransactionsByPriceAndNonce(signer types.Signer, txs map[common.Address][]*txpool.LazyTransaction, baseFee *big.Int) *transactionsByPriceAndNonce {
|
|
// Initialize a price and received time based heap with the head transactions
|
|
heads := make(txByPriceAndTime, 0, len(txs))
|
|
for from, accTxs := range txs {
|
|
wrapped, err := newTxWithMinerFee(accTxs[0], from, baseFee)
|
|
if err != nil {
|
|
delete(txs, from)
|
|
continue
|
|
}
|
|
heads = append(heads, wrapped)
|
|
txs[from] = accTxs[1:]
|
|
}
|
|
heap.Init(&heads)
|
|
|
|
// Assemble and return the transaction set
|
|
return &transactionsByPriceAndNonce{
|
|
txs: txs,
|
|
heads: heads,
|
|
signer: signer,
|
|
baseFee: baseFee,
|
|
}
|
|
}
|
|
|
|
// Peek returns the next transaction by price.
|
|
func (t *transactionsByPriceAndNonce) Peek() *txpool.LazyTransaction {
|
|
if len(t.heads) == 0 {
|
|
return nil
|
|
}
|
|
return t.heads[0].tx
|
|
}
|
|
|
|
// Shift replaces the current best head with the next one from the same account.
|
|
func (t *transactionsByPriceAndNonce) Shift() {
|
|
acc := t.heads[0].from
|
|
if txs, ok := t.txs[acc]; ok && len(txs) > 0 {
|
|
if wrapped, err := newTxWithMinerFee(txs[0], acc, t.baseFee); err == nil {
|
|
t.heads[0], t.txs[acc] = wrapped, txs[1:]
|
|
heap.Fix(&t.heads, 0)
|
|
return
|
|
}
|
|
}
|
|
heap.Pop(&t.heads)
|
|
}
|
|
|
|
// Pop removes the best transaction, *not* replacing it with the next one from
|
|
// the same account. This should be used when a transaction cannot be executed
|
|
// and hence all subsequent ones should be discarded from the same account.
|
|
func (t *transactionsByPriceAndNonce) Pop() {
|
|
heap.Pop(&t.heads)
|
|
}
|
|
|
|
// l1MessagesByQueueIndex represents a set of L1 messages ordered by their queue indices.
|
|
type l1MessagesByQueueIndex struct {
|
|
txPool *txpool.TxPool
|
|
msgs []types.L1MessageTx
|
|
}
|
|
|
|
func newL1MessagesByQueueIndex(txPool *txpool.TxPool, msgs []types.L1MessageTx) (*l1MessagesByQueueIndex, error) {
|
|
// sort by queue index
|
|
sort.Slice(msgs, func(i, j int) bool {
|
|
return msgs[i].QueueIndex < msgs[j].QueueIndex
|
|
})
|
|
|
|
// check for duplicates/gaps
|
|
for ii := 0; ii < len(msgs)-1; ii++ {
|
|
current := msgs[ii].QueueIndex
|
|
next := msgs[ii+1].QueueIndex
|
|
if next != current+1 {
|
|
return nil, fmt.Errorf("invalid L1 message set, current index: %d, next index: %d", current, next)
|
|
}
|
|
}
|
|
|
|
return &l1MessagesByQueueIndex{txPool: txPool, msgs: msgs}, nil
|
|
}
|
|
|
|
func (t *l1MessagesByQueueIndex) Peek() *txpool.LazyTransaction {
|
|
if len(t.msgs) == 0 {
|
|
return nil
|
|
}
|
|
return txToLazyTx(t.txPool, types.NewTx(&t.msgs[0]))
|
|
}
|
|
|
|
func (t *l1MessagesByQueueIndex) Shift() {
|
|
t.msgs = t.msgs[1:]
|
|
}
|
|
|
|
func (t *l1MessagesByQueueIndex) Pop() {
|
|
log.Error("Pop() is called on l1MessagesByQueueIndex")
|
|
|
|
// this is a logic error, the intention should be "Shift()",
|
|
// so we will follow the same behavior in Pop
|
|
t.Shift()
|
|
}
|
|
|
|
// orderedTransactionSet represents a set of transactions and some ordering on top of this set.
|
|
type orderedTransactionSet interface {
|
|
// Peek returns the next transaction.
|
|
Peek() *txpool.LazyTransaction
|
|
|
|
// Shift removes the next transaction.
|
|
Shift()
|
|
|
|
// Pop removes all transactions from the current account.
|
|
Pop()
|
|
}
|