forked from cerc-io/plugeth
2a6beb6a39
This PR removes the newly added txpool.Transaction wrapper type, and instead adds a way of keeping the blob sidecar within types.Transaction. It's better this way because most code in go-ethereum does not care about blob transactions, and probably never will. This will start mattering especially on the client side of RPC, where all APIs are based on types.Transaction. Users need to be able to use the same signing flows they already have. However, since blobs are only allowed in some places but not others, we will now need to add checks to avoid creating invalid blocks. I'm still trying to figure out the best place to do some of these. The way I have it currently is as follows: - In block validation (import), txs are verified not to have a blob sidecar. - In miner, we strip off the sidecar when committing the transaction into the block. - In TxPool validation, txs must have a sidecar to be added into the blobpool. - Note there is a special case here: when transactions are re-added because of a chain reorg, we cannot use the transactions gathered from the old chain blocks as-is, because they will be missing their blobs. This was previously handled by storing the blobs into the 'blobpool limbo'. The code has now changed to store the full transaction in the limbo instead, but it might be confusing for code readers why we're not simply adding the types.Transaction we already have. Code changes summary: - txpool.Transaction removed and all uses replaced by types.Transaction again - blobpool now stores types.Transaction instead of defining its own blobTx format for storage - the blobpool limbo now stores types.Transaction instead of storing only the blobs - checks to validate the presence/absence of the blob sidecar added in certain critical places
128 lines
5.4 KiB
Go
128 lines
5.4 KiB
Go
// Copyright 2023 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 txpool
|
|
|
|
import (
|
|
"math/big"
|
|
"time"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/core"
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
"github.com/ethereum/go-ethereum/event"
|
|
)
|
|
|
|
// LazyTransaction contains a small subset of the transaction properties that is
|
|
// enough for the miner and other APIs to handle large batches of transactions;
|
|
// and supports pulling up the entire transaction when really needed.
|
|
type LazyTransaction struct {
|
|
Pool SubPool // Transaction subpool to pull the real transaction up
|
|
Hash common.Hash // Transaction hash to pull up if needed
|
|
Tx *types.Transaction // Transaction if already resolved
|
|
|
|
Time time.Time // Time when the transaction was first seen
|
|
GasFeeCap *big.Int // Maximum fee per gas the transaction may consume
|
|
GasTipCap *big.Int // Maximum miner tip per gas the transaction can pay
|
|
}
|
|
|
|
// Resolve retrieves the full transaction belonging to a lazy handle if it is still
|
|
// maintained by the transaction pool.
|
|
func (ltx *LazyTransaction) Resolve() *types.Transaction {
|
|
if ltx.Tx == nil {
|
|
ltx.Tx = ltx.Pool.Get(ltx.Hash)
|
|
}
|
|
return ltx.Tx
|
|
}
|
|
|
|
// AddressReserver is passed by the main transaction pool to subpools, so they
|
|
// may request (and relinquish) exclusive access to certain addresses.
|
|
type AddressReserver func(addr common.Address, reserve bool) error
|
|
|
|
// SubPool represents a specialized transaction pool that lives on its own (e.g.
|
|
// blob pool). Since independent of how many specialized pools we have, they do
|
|
// need to be updated in lockstep and assemble into one coherent view for block
|
|
// production, this interface defines the common methods that allow the primary
|
|
// transaction pool to manage the subpools.
|
|
type SubPool interface {
|
|
// Filter is a selector used to decide whether a transaction whould be added
|
|
// to this particular subpool.
|
|
Filter(tx *types.Transaction) bool
|
|
|
|
// Init sets the base parameters of the subpool, allowing it to load any saved
|
|
// transactions from disk and also permitting internal maintenance routines to
|
|
// start up.
|
|
//
|
|
// These should not be passed as a constructor argument - nor should the pools
|
|
// start by themselves - in order to keep multiple subpools in lockstep with
|
|
// one another.
|
|
Init(gasTip *big.Int, head *types.Header, reserve AddressReserver) error
|
|
|
|
// Close terminates any background processing threads and releases any held
|
|
// resources.
|
|
Close() error
|
|
|
|
// Reset retrieves the current state of the blockchain and ensures the content
|
|
// of the transaction pool is valid with regard to the chain state.
|
|
Reset(oldHead, newHead *types.Header)
|
|
|
|
// SetGasTip updates the minimum price required by the subpool for a new
|
|
// transaction, and drops all transactions below this threshold.
|
|
SetGasTip(tip *big.Int)
|
|
|
|
// Has returns an indicator whether subpool has a transaction cached with the
|
|
// given hash.
|
|
Has(hash common.Hash) bool
|
|
|
|
// Get returns a transaction if it is contained in the pool, or nil otherwise.
|
|
Get(hash common.Hash) *types.Transaction
|
|
|
|
// Add enqueues a batch of transactions into the pool if they are valid. Due
|
|
// to the large transaction churn, add may postpone fully integrating the tx
|
|
// to a later point to batch multiple ones together.
|
|
Add(txs []*types.Transaction, local bool, sync bool) []error
|
|
|
|
// Pending retrieves all currently processable transactions, grouped by origin
|
|
// account and sorted by nonce.
|
|
Pending(enforceTips bool) map[common.Address][]*LazyTransaction
|
|
|
|
// SubscribeTransactions subscribes to new transaction events.
|
|
SubscribeTransactions(ch chan<- core.NewTxsEvent) event.Subscription
|
|
|
|
// Nonce returns the next nonce of an account, with all transactions executable
|
|
// by the pool already applied on top.
|
|
Nonce(addr common.Address) uint64
|
|
|
|
// Stats retrieves the current pool stats, namely the number of pending and the
|
|
// number of queued (non-executable) transactions.
|
|
Stats() (int, int)
|
|
|
|
// Content retrieves the data content of the transaction pool, returning all the
|
|
// pending as well as queued transactions, grouped by account and sorted by nonce.
|
|
Content() (map[common.Address][]*types.Transaction, map[common.Address][]*types.Transaction)
|
|
|
|
// ContentFrom retrieves the data content of the transaction pool, returning the
|
|
// pending as well as queued transactions of this address, grouped by nonce.
|
|
ContentFrom(addr common.Address) ([]*types.Transaction, []*types.Transaction)
|
|
|
|
// Locals retrieves the accounts currently considered local by the pool.
|
|
Locals() []common.Address
|
|
|
|
// Status returns the known status (unknown/pending/queued) of a transaction
|
|
// identified by their hashes.
|
|
Status(hash common.Hash) TxStatus
|
|
}
|