From 03f614fb278a7da17fcd6231d9de1ff1086d704f Mon Sep 17 00:00:00 2001 From: David Date: Tue, 4 Mar 2025 11:15:56 +0900 Subject: [PATCH] chore(core): revert `[]*ethapi.RPCTransaction` changes in miner (#394) This reverts commit afd09afd03871f9c66231a92bba706f4c491b877. --- miner/taiko_miner.go | 3 +-- miner/taiko_worker.go | 12 +----------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/miner/taiko_miner.go b/miner/taiko_miner.go index 7656acdb8c..4bc09792a2 100644 --- a/miner/taiko_miner.go +++ b/miner/taiko_miner.go @@ -6,13 +6,12 @@ import ( "github.com/ethereum/go-ethereum/beacon/engine" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" ) // PreBuiltTxList is a pre-built transaction list based on the latest chain state, // with estimated gas used / bytes. type PreBuiltTxList struct { - TxList []*ethapi.RPCTransaction + TxList types.Transactions EstimatedGasUsed uint64 BytesLength uint64 } diff --git a/miner/taiko_worker.go b/miner/taiko_worker.go index a3233723f8..bdf766cba3 100644 --- a/miner/taiko_worker.go +++ b/miner/taiko_worker.go @@ -15,7 +15,6 @@ import ( "github.com/ethereum/go-ethereum/core/txpool" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/internal/ethapi" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" @@ -94,7 +93,7 @@ func (w *Miner) buildTransactionsLists( } return lastTransaction, &PreBuiltTxList{ - TxList: w.toRPCTransactions(env.txs), + TxList: env.txs, EstimatedGasUsed: env.header.GasLimit - env.gasPool.Gas(), BytesLength: uint64(len(b)), }, nil @@ -339,15 +338,6 @@ loop: return lastTransaction } -// toRPCTransactions converts the given transactions to RPC transactions. -func (w *Miner) toRPCTransactions(txs types.Transactions) []*ethapi.RPCTransaction { - var rpcTxs []*ethapi.RPCTransaction - for _, tx := range txs { - rpcTxs = append(rpcTxs, ethapi.NewRPCPendingTransaction(tx, nil, w.chainConfig)) - } - return rpcTxs -} - // encodeAndCompressTxList encodes and compresses the given transactions list. func encodeAndCompressTxList(txs types.Transactions) ([]byte, error) { b, err := rlp.EncodeToBytes(txs)