Merge branch 'mempool-feed-stage' into merge/v1.13.14

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Build geth
         run: |
-          cd cmd/geth && /opt/go/1.19.5/bin/go build
+          cd cmd/geth && /opt/go/1.21.0/bin/go build
           tar -czvf geth-$(basename ${GITHUB_REF})-linux-arm64.tar.gz geth
           echo $(md5sum geth | awk '{print $1}') > geth-$(basename ${GITHUB_REF})-linux-arm64.tar.gz.md5
       - name: Upload geth to release page

cmd/utils/history_test.go

@@ -171,7 +171,7 @@ func TestHistoryImportAndExport(t *testing.T) {
 		db2.Close()
 	})
 
-	genesis.MustCommit(db2, triedb.NewDatabase(db, triedb.HashDefaults))
+	genesis.MustCommit(db2, triedb.NewDatabase(db, triedb.HashDefaults)) 
 	imported, err := core.NewBlockChain(db2, nil, genesis, nil, ethash.NewFaker(), vm.Config{}, nil, nil)
 	if err != nil {
 		t.Fatalf("unable to initialize chain: %v", err)

core/txpool/blobpool/blobpool.go

@@ -106,6 +106,10 @@ type blobTxMeta struct {
 	evictionExecTip      *uint256.Int // Worst gas tip across all previous nonces
 	evictionExecFeeJumps float64      // Worst base fee (converted to fee jumps) across all previous nonces
 	evictionBlobFeeJumps float64      // Worse blob fee (converted to fee jumps) across all previous nonces
+
+	// -------- BLOCKNATIVE MODIFICATION START -------------
+	blobHashes []common.Hash
+	// -------- BLOCKNATIVE MODIFICATION STOP -------------
 }
 
 // newBlobTxMeta retrieves the indexed metadata fields from a blob transaction
@@ -122,6 +126,10 @@ func newBlobTxMeta(id uint64, size uint32, tx *types.Transaction) *blobTxMeta {
 		blobFeeCap: uint256.MustFromBig(tx.BlobGasFeeCap()),
 		execGas:    tx.Gas(),
 		blobGas:    tx.BlobGas(),
+
+		// -------- BLOCKNATIVE MODIFICATION START -------------
+		blobHashes: tx.BlobHashes(),
+		// -------- BLOCKNATIVE MODIFICATION STOP -------------
 	}
 	meta.basefeeJumps = dynamicFeeJumps(meta.execFeeCap)
 	meta.blobfeeJumps = dynamicFeeJumps(meta.blobFeeCap)
@@ -1624,7 +1632,33 @@ func (p *BlobPool) Stats() (int, int) {
 // For the blob pool, this method will return nothing for now.
 // TODO(karalabe): Abstract out the returned metadata.
 func (p *BlobPool) Content() (map[common.Address][]*types.Transaction, map[common.Address][]*types.Transaction) {
-	return make(map[common.Address][]*types.Transaction), make(map[common.Address][]*types.Transaction)
+
+	// -------- BLOCKNATIVE MODIFICATION START -------------
+
+	pending := make(map[common.Address][]*types.Transaction)
+	p.lock.RLock()
+	defer p.lock.RUnlock()
+
+	for addr, txs := range p.index {
+		var lazies []*types.Transaction
+		for _, tx := range txs {
+			lazies = append(lazies, types.NewTx(&types.BlobTx{
+				Gas:        tx.execGas,
+				BlobFeeCap: tx.blobFeeCap,
+				Nonce:      tx.nonce,
+				GasFeeCap:  tx.execFeeCap,
+				GasTipCap:  tx.execTipCap,
+				BlobHashes: tx.blobHashes,
+			}))
+		}
+		if len(lazies) > 0 {
+			pending[addr] = lazies
+		}
+
+	}
+
+	return pending, make(map[common.Address][]*types.Transaction)
+	// -------- BLOCKNATIVE MODIFICATION STOP --------------
 }
 
 // ContentFrom retrieves the data content of the transaction pool, returning the
@@ -1652,7 +1686,6 @@ func (p *BlobPool) Status(hash common.Hash) txpool.TxStatus {
 	return txpool.TxStatusUnknown
 }
 
-
 // SubscribeDropTxsEvent registers a subscription of core.DropTxsEvent and
 // starts sending event to the given channel.
 func (pool *BlobPool) SubscribeDropTxsEvent(ch chan<- core.DropTxsEvent) event.Subscription {

core/txpool/blobpool/blobpool_test.go

@@ -390,8 +390,8 @@ func TestOpenDrops(t *testing.T) {
 
 		id, _ := store.Put(blob)
 		filled[id] = struct{}{}
-	}
-	// Insert a sequence of transactions with partially passed nonces to verify
+	} 
+	// Insert a sequence of transactions with partially passed nonces to verify 
 	// that the included part of the set will get dropped (case 4).
 	var (
 		overlapper, _ = crypto.GenerateKey()

eth/tracers/blocknative/decoder/calldata.go

@@ -1,9 +1,10 @@
 package decoder
 
 import (
+	"math/big"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
-	"math/big"
 )
 
 func decodeCallData(sender common.Address, contract *Contract, input []byte) (*CallData, error) {

eth/tracers/blocknative/decoder/evm_caller.go

@@ -88,6 +88,10 @@ func evmCallMethodDecimals(evmCall evmCallFn, addr common.Address) (uint8, error
 
 // evmCallMethodTokenURI decodes the tokenURI of an asset from the EVM.
 func evmCallMethodTokenURI(evmCall evmCallFn, addr common.Address, tokenID *big.Int) (string, error) {
+	if tokenID == nil {
+		return "", fmt.Errorf("tokenID is nil")
+	}
+
 	tokenIDBytes := tokenID.Bytes()
 	if len(tokenIDBytes) > 32 {
 		return "", fmt.Errorf("tokenID is too large")
@@ -99,6 +103,10 @@ func evmCallMethodTokenURI(evmCall evmCallFn, addr common.Address, tokenID *big.
 
 // evmCallMethodURI decodes the URI of an asset from the EVM.
 func evmCallMethodURI(evmCall evmCallFn, addr common.Address, tokenID *big.Int) (string, error) {
+	if tokenID == nil {
+		return "", fmt.Errorf("tokenID is nil")
+	}
+
 	tokenIDBytes := common.LeftPadBytes(tokenID.Bytes(), 32)
 	input := append(methodIDURI, tokenIDBytes...)
 	return callAndDecodeString(evmCall, addr, input)
@@ -113,6 +121,10 @@ func evmCallMethodBalanceOf(evmCall evmCallFn, addr common.Address, owner common
 
 // evmCallMethodBalanceOf2 decodes the balance of an asset from the EVM.
 func evmCallMethodBalanceOf2(evmCall evmCallFn, addr common.Address, owner common.Address, tokenID *big.Int) (*big.Int, error) {
+	if tokenID == nil {
+		return nil, fmt.Errorf("tokenID is nil")
+	}
+
 	tokenIDBytes := common.LeftPadBytes(tokenID.Bytes(), 32)
 	ownerBytes := common.LeftPadBytes(owner.Bytes(), 32)
 	input := append(methodIDBalanceOf2, ownerBytes...)

eth/tracers/blocknative/decoder/methods.go

@@ -5,6 +5,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+
 	"github.com/ethereum/go-ethereum/common"
 )
 
@@ -82,7 +83,7 @@ var methodSignatures = map[string]string{
 type MethodID []byte
 
 func (m MethodID) Is(other MethodID) bool {
-	return bytes.Compare(m, other) == 0
+	return bytes.Equal(m, other)
 }
 
 func (m MethodID) String() string {
@@ -113,7 +114,6 @@ func (m *MethodID) UnmarshalJSON(b []byte) error {
 	}
 
 	if len(b) > methodIDEncodedLen {
-		fmt.Println("sdfasdfasdf:", len(b), string(b), b)
 		return ErrMethodIDTooLong
 	}
 

internal/ethapi/transaction_args.go

@@ -95,7 +95,7 @@ func (args *TransactionArgs) data() []byte {
 	return nil
 }
 
-// setDefaults fills in default values for unspecified tx fields.
+// setDefaults fills in default values for unspecified tx fields. 
 func (args *TransactionArgs) setDefaults(ctx context.Context, b Backend, skipGasEstimation bool) error {
 	if err := args.setBlobTxSidecar(ctx, b); err != nil {
 		return err
@@ -135,7 +135,7 @@ func (args *TransactionArgs) setDefaults(ctx context.Context, b Backend, skipGas
 			return errors.New(`contract creation without any data provided`)
 		}
 	}
-
+      
 	if args.Gas == nil {
 		if skipGasEstimation { // Skip gas usage estimation if a precise gas limit is not critical, e.g., in non-transaction calls.
 			gas := hexutil.Uint64(b.RPCGasCap())
@@ -211,7 +211,7 @@ func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend) erro
 		}
 		return nil // No need to set anything, user already set MaxFeePerGas and MaxPriorityFeePerGas
 	}
-
+  
 	// Sanity check the non-EIP-1559 fee parameters.
 	isLondon := b.ChainConfig().IsLondon(head.Number)
 	if args.GasPrice != nil && !eip1559ParamsSet {

miner/ordering.go

@@ -126,7 +126,7 @@ func newTransactionsByPriceAndNonce(signer types.Signer, txs map[common.Address]
 	}
 }
 
-// Peek returns the next transaction by price.
+// Peek returns the next transaction by price. 
 func (t *transactionsByPriceAndNonce) Peek() (*txpool.LazyTransaction, *uint256.Int) {
 	if len(t.heads) == 0 {
 		return nil, nil

miner/worker.go

@@ -206,7 +206,7 @@ type worker struct {
 	mu       sync.RWMutex // The lock used to protect the coinbase and extra fields
 	coinbase common.Address
 	extra    []byte
-	tip      *uint256.Int // Minimum tip needed for non-local transaction to include them
+	tip      *uint256.Int // Minimum tip needed for non-local transaction to include them 
 
 	pendingMu    sync.RWMutex
 	pendingTasks map[common.Hash]*task
@@ -333,7 +333,7 @@ func (w *worker) setExtra(extra []byte) {
 // setGasTip sets the minimum miner tip needed to include a non-local transaction.
 func (w *worker) setGasTip(tip *big.Int) {
 	w.mu.Lock()
-	defer w.mu.Unlock()
+	defer w.mu.Unlock() 
 	w.tip = uint256.MustFromBig(tip)
 }
 
@@ -864,6 +864,11 @@ func (w *worker) commitTransactions(env *environment, plainTxs, blobTxs *transac
 			txs.Pop()
 			continue
 		}
+		// If we don't receive enough tip for the next transaction, skip the account
+		if tip.Cmp(minTip) < 0 {
+			log.Trace("Not enough tip for transaction", "hash", ltx.Hash, "tip", tip, "needed", minTip)
+			break // If the next-best is too low, surely no better will be available
+		}
 		// Transaction seems to fit, pull it up from the pool
 		tx := ltx.Resolve()
 		if tx == nil {
@@ -1056,7 +1061,13 @@ func (w *worker) fillTransactions(interrupt *atomic.Int32, env *environment) err
 			localBlobTxs[account] = txs
 		}
 	}
-	// Fill the block with all available pending transactions.
+	// Fill the block with all available pending transactions. 
+
+	// w.mu.RLock()
+	// tip := w.tip
+	// w.mu.RUnlock()
+
+
 	if len(localPlainTxs) > 0 || len(localBlobTxs) > 0 {
 		plainTxs := newTransactionsByPriceAndNonce(env.signer, localPlainTxs, env.header.BaseFee)
 		blobTxs := newTransactionsByPriceAndNonce(env.signer, localBlobTxs, env.header.BaseFee)

params/version.go

@@ -22,8 +22,8 @@ import (
 
 const (
 	VersionMajor = 1        // Major version component of the current release
-	VersionMinor = 13       // Minor version component of the current release
-	VersionPatch = 14       // Patch version component of the current release
+	VersionMinor = 13       // Minor version component of the current release 
+	VersionPatch = 14       // Patch version component of the current release 
 	VersionMeta  = "stable" // Version metadata to append to the version string
 )