fix(transaction): use EstimateGasAtBlock instead of EstimateGas (#5252)

gacevicljubisa · web-flow · commit bf267453b447 · 2025-10-27T15:02:44.000+01:00
diff --git a/pkg/node/chain.go b/pkg/node/chain.go
@@ -372,8 +372,8 @@ func (m noOpChainBackend) SuggestGasTipCap(context.Context) (*big.Int, error) {
 	panic("chain no op: SuggestGasTipCap")
 }
 
-func (m noOpChainBackend) EstimateGas(context.Context, ethereum.CallMsg) (uint64, error) {
-	panic("chain no op: EstimateGas")
+func (m noOpChainBackend) EstimateGasAtBlock(context.Context, ethereum.CallMsg, *big.Int) (uint64, error) {
+	panic("chain no op: EstimateGasAtBlock")
 }
 
 func (m noOpChainBackend) SendTransaction(context.Context, *types.Transaction) error {
diff --git a/pkg/transaction/backend/backend.go b/pkg/transaction/backend/backend.go
@@ -20,7 +20,7 @@ type Geth interface {
 	CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) ([]byte, error)
 	ChainID(ctx context.Context) (*big.Int, error)
 	Close()
-	EstimateGas(ctx context.Context, msg ethereum.CallMsg) (uint64, error)
+	EstimateGasAtBlock(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (uint64, error)
 	FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]types.Log, error)
 	HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error)
 	NonceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (uint64, error)
diff --git a/pkg/transaction/backendmock/backend.go b/pkg/transaction/backendmock/backend.go
@@ -20,7 +20,7 @@ type backendMock struct {
 	sendTransaction    func(ctx context.Context, tx *types.Transaction) error
 	suggestedFeeAndTip func(ctx context.Context, gasPrice *big.Int, boostPercent int) (*big.Int, *big.Int, error)
 	suggestGasTipCap   func(ctx context.Context) (*big.Int, error)
-	estimateGas        func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error)
+	estimateGasAtBlock func(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error)
 	transactionReceipt func(ctx context.Context, txHash common.Hash) (*types.Receipt, error)
 	pendingNonceAt     func(ctx context.Context, account common.Address) (uint64, error)
 	transactionByHash  func(ctx context.Context, hash common.Hash) (tx *types.Transaction, isPending bool, err error)
@@ -51,9 +51,9 @@ func (m *backendMock) SuggestedFeeAndTip(ctx context.Context, gasPrice *big.Int,
 	return nil, nil, errors.New("not implemented")
 }
 
-func (m *backendMock) EstimateGas(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {
-	if m.estimateGas != nil {
-		return m.estimateGas(ctx, call)
+func (m *backendMock) EstimateGasAtBlock(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (uint64, error) {
+	if m.estimateGasAtBlock != nil {
+		return m.estimateGasAtBlock(ctx, msg, blockNumber)
 	}
 	return 0, errors.New("not implemented")
 }
@@ -171,9 +171,9 @@ func WithSuggestGasTipCapFunc(f func(ctx context.Context) (*big.Int, error)) Opt
 	})
 }
 
-func WithEstimateGasFunc(f func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error)) Option {
+func WithEstimateGasAtBlockFunc(f func(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error)) Option {
 	return optionFunc(func(s *backendMock) {
-		s.estimateGas = f
+		s.estimateGasAtBlock = f
 	})
 }
 
diff --git a/pkg/transaction/backendsimulation/backend.go b/pkg/transaction/backendsimulation/backend.go
@@ -95,7 +95,7 @@ func (m *simulatedBackend) SuggestedFeeAndTip(ctx context.Context, gasPrice *big
 	return nil, nil, errors.New("not implemented")
 }
 
-func (m *simulatedBackend) EstimateGas(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {
+func (m *simulatedBackend) EstimateGasAtBlock(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (uint64, error) {
 	return 0, errors.New("not implemented")
 }
 
diff --git a/pkg/transaction/transaction.go b/pkg/transaction/transaction.go
@@ -31,7 +31,6 @@ import (
 const loggerName = "transaction"
 
 const (
-	noncePrefix              = "transaction_nonce_"
 	storedTransactionPrefix  = "transaction_stored_"
 	pendingTransactionPrefix = "transaction_pending_"
 )
@@ -275,11 +274,11 @@ func (t *transactionService) StoredTransaction(txHash common.Hash) (*StoredTrans
 func (t *transactionService) prepareTransaction(ctx context.Context, request *TxRequest, nonce uint64, boostPercent int) (tx *types.Transaction, err error) {
 	var gasLimit uint64
 	if request.GasLimit == 0 {
-		gasLimit, err = t.backend.EstimateGas(ctx, ethereum.CallMsg{
+		gasLimit, err = t.backend.EstimateGasAtBlock(ctx, ethereum.CallMsg{
 			From: t.sender,
 			To:   request.To,
 			Data: request.Data,
-		})
+		}, nil) // nil for latest block
 		if err != nil {
 			t.logger.Debug("estimate gas failed", "error", err)
 			gasLimit = request.MinEstimatedGasLimit
diff --git a/pkg/transaction/transaction_test.go b/pkg/transaction/transaction_test.go
@@ -151,11 +151,11 @@ func TestTransactionSend(t *testing.T) {
 					}
 					return nil
 				}),
-				backendmock.WithEstimateGasFunc(func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {
-					if !bytes.Equal(call.To.Bytes(), recipient.Bytes()) {
-						t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, call.To)
+				backendmock.WithEstimateGasAtBlockFunc(func(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error) {
+					if !bytes.Equal(msg.To.Bytes(), recipient.Bytes()) {
+						t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, msg.To)
 					}
-					if !bytes.Equal(call.Data, txData) {
+					if !bytes.Equal(msg.Data, txData) {
 						t.Fatal("estimating with wrong data")
 					}
 					return estimatedGasLimit, nil
@@ -234,7 +234,7 @@ func TestTransactionSend(t *testing.T) {
 					}
 					return nil
 				}),
-				backendmock.WithEstimateGasFunc(func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {
+				backendmock.WithEstimateGasAtBlockFunc(func(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error) {
 					return 0, errors.New("estimate failure")
 				}),
 				backendmock.WithPendingNonceAtFunc(func(ctx context.Context, account common.Address) (uint64, error) {
@@ -314,11 +314,11 @@ func TestTransactionSend(t *testing.T) {
 					}
 					return nil
 				}),
-				backendmock.WithEstimateGasFunc(func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {
-					if !bytes.Equal(call.To.Bytes(), recipient.Bytes()) {
-						t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, call.To)
+				backendmock.WithEstimateGasAtBlockFunc(func(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error) {
+					if !bytes.Equal(msg.To.Bytes(), recipient.Bytes()) {
+						t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, msg.To)
 					}
-					if !bytes.Equal(call.Data, txData) {
+					if !bytes.Equal(msg.Data, txData) {
 						t.Fatal("estimating with wrong data")
 					}
 					return estimatedGasLimit, nil
@@ -396,11 +396,11 @@ func TestTransactionSend(t *testing.T) {
 					}
 					return nil
 				}),
-				backendmock.WithEstimateGasFunc(func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {
-					if !bytes.Equal(call.To.Bytes(), recipient.Bytes()) {
-						t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, call.To)
+				backendmock.WithEstimateGasAtBlockFunc(func(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error) {
+					if !bytes.Equal(msg.To.Bytes(), recipient.Bytes()) {
+						t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, msg.To)
 					}
-					if !bytes.Equal(call.Data, txData) {
+					if !bytes.Equal(msg.Data, txData) {
 						t.Fatal("estimating with wrong data")
 					}
 					return estimatedGasLimit, nil
@@ -461,7 +461,7 @@ func TestTransactionSend(t *testing.T) {
 					}
 					return nil
 				}),
-				backendmock.WithEstimateGasFunc(func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {
+				backendmock.WithEstimateGasAtBlockFunc(func(ctx context.Context, call ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error) {
 					if !bytes.Equal(call.To.Bytes(), recipient.Bytes()) {
 						t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, call.To)
 					}
@@ -527,7 +527,7 @@ func TestTransactionSend(t *testing.T) {
 					}
 					return nil
 				}),
-				backendmock.WithEstimateGasFunc(func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {
+				backendmock.WithEstimateGasAtBlockFunc(func(ctx context.Context, call ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error) {
 					if !bytes.Equal(call.To.Bytes(), recipient.Bytes()) {
 						t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, call.To)
 					}
diff --git a/pkg/transaction/wrapped/wrapped.go b/pkg/transaction/wrapped/wrapped.go
@@ -138,11 +138,10 @@ func (b *wrappedBackend) SuggestGasTipCap(ctx context.Context) (*big.Int, error)
 	}
 	return gasTipCap, nil
 }
-
-func (b *wrappedBackend) EstimateGas(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {
+func (b *wrappedBackend) EstimateGasAtBlock(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (uint64, error) {
 	b.metrics.TotalRPCCalls.Inc()
 	b.metrics.EstimateGasCalls.Inc()
-	gas, err = b.backend.EstimateGas(ctx, call)
+	gas, err := b.backend.EstimateGasAtBlock(ctx, msg, blockNumber)
 	if err != nil {
 		b.metrics.TotalRPCErrors.Inc()
 		return 0, err

Original file line number	Diff line number	Diff line change
`@@ -372,8 +372,8 @@ func (m noOpChainBackend) SuggestGasTipCap(context.Context) (*big.Int, error) {`
`372`	`372`	`panic("chain no op: SuggestGasTipCap")`
`373`	`373`	`}`
`374`	`374`
`375`		`-func (m noOpChainBackend) EstimateGas(context.Context, ethereum.CallMsg) (uint64, error) {`
`376`		`- panic("chain no op: EstimateGas")`
	`375`	`+func (m noOpChainBackend) EstimateGasAtBlock(context.Context, ethereum.CallMsg, *big.Int) (uint64, error) {`
	`376`	`+ panic("chain no op: EstimateGasAtBlock")`
`377`	`377`	`}`
`378`	`378`
`379`	`379`	`func (m noOpChainBackend) SendTransaction(context.Context, *types.Transaction) error {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ type backendMock struct {`
`20`	`20`	`sendTransaction func(ctx context.Context, tx *types.Transaction) error`
`21`	`21`	`suggestedFeeAndTip func(ctx context.Context, gasPrice big.Int, boostPercent int) (big.Int, *big.Int, error)`
`22`	`22`	`suggestGasTipCap func(ctx context.Context) (*big.Int, error)`
`23`		`- estimateGas func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error)`
	`23`	`+ estimateGasAtBlock func(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error)`
`24`	`24`	`transactionReceipt func(ctx context.Context, txHash common.Hash) (*types.Receipt, error)`
`25`	`25`	`pendingNonceAt func(ctx context.Context, account common.Address) (uint64, error)`
`26`	`26`	`transactionByHash func(ctx context.Context, hash common.Hash) (tx *types.Transaction, isPending bool, err error)`
`@@ -51,9 +51,9 @@ func (m backendMock) SuggestedFeeAndTip(ctx context.Context, gasPrice big.Int,`
`51`	`51`	`return nil, nil, errors.New("not implemented")`
`52`	`52`	`}`
`53`	`53`
`54`		`-func (m *backendMock) EstimateGas(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {`
`55`		`- if m.estimateGas != nil {`
`56`		`- return m.estimateGas(ctx, call)`
	`54`	`+func (m backendMock) EstimateGasAtBlock(ctx context.Context, msg ethereum.CallMsg, blockNumber big.Int) (uint64, error) {`
	`55`	`+ if m.estimateGasAtBlock != nil {`
	`56`	`+ return m.estimateGasAtBlock(ctx, msg, blockNumber)`
`57`	`57`	`}`
`58`	`58`	`return 0, errors.New("not implemented")`
`59`	`59`	`}`
`@@ -171,9 +171,9 @@ func WithSuggestGasTipCapFunc(f func(ctx context.Context) (*big.Int, error)) Opt`
`171`	`171`	`})`
`172`	`172`	`}`
`173`	`173`
`174`		`-func WithEstimateGasFunc(f func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error)) Option {`
	`174`	`+func WithEstimateGasAtBlockFunc(f func(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error)) Option {`
`175`	`175`	`return optionFunc(func(s *backendMock) {`
`176`		`- s.estimateGas = f`
	`176`	`+ s.estimateGasAtBlock = f`
`177`	`177`	`})`
`178`	`178`	`}`
`179`	`179`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func (m simulatedBackend) SuggestedFeeAndTip(ctx context.Context, gasPrice big`
`95`	`95`	`return nil, nil, errors.New("not implemented")`
`96`	`96`	`}`
`97`	`97`
`98`		`-func (m *simulatedBackend) EstimateGas(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {`
	`98`	`+func (m simulatedBackend) EstimateGasAtBlock(ctx context.Context, msg ethereum.CallMsg, blockNumber big.Int) (uint64, error) {`
`99`	`99`	`return 0, errors.New("not implemented")`
`100`	`100`	`}`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -151,11 +151,11 @@ func TestTransactionSend(t *testing.T) {`
`151`	`151`	`}`
`152`	`152`	`return nil`
`153`	`153`	`}),`
`154`		`- backendmock.WithEstimateGasFunc(func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {`
`155`		`- if !bytes.Equal(call.To.Bytes(), recipient.Bytes()) {`
`156`		`- t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, call.To)`
	`154`	`+ backendmock.WithEstimateGasAtBlockFunc(func(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error) {`
	`155`	`+ if !bytes.Equal(msg.To.Bytes(), recipient.Bytes()) {`
	`156`	`+ t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, msg.To)`
`157`	`157`	`}`
`158`		`- if !bytes.Equal(call.Data, txData) {`
	`158`	`+ if !bytes.Equal(msg.Data, txData) {`
`159`	`159`	`t.Fatal("estimating with wrong data")`
`160`	`160`	`}`
`161`	`161`	`return estimatedGasLimit, nil`
`@@ -234,7 +234,7 @@ func TestTransactionSend(t *testing.T) {`
`234`	`234`	`}`
`235`	`235`	`return nil`
`236`	`236`	`}),`
`237`		`- backendmock.WithEstimateGasFunc(func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {`
	`237`	`+ backendmock.WithEstimateGasAtBlockFunc(func(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error) {`
`238`	`238`	`return 0, errors.New("estimate failure")`
`239`	`239`	`}),`
`240`	`240`	`backendmock.WithPendingNonceAtFunc(func(ctx context.Context, account common.Address) (uint64, error) {`
`@@ -314,11 +314,11 @@ func TestTransactionSend(t *testing.T) {`
`314`	`314`	`}`
`315`	`315`	`return nil`
`316`	`316`	`}),`
`317`		`- backendmock.WithEstimateGasFunc(func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {`
`318`		`- if !bytes.Equal(call.To.Bytes(), recipient.Bytes()) {`
`319`		`- t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, call.To)`
	`317`	`+ backendmock.WithEstimateGasAtBlockFunc(func(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error) {`
	`318`	`+ if !bytes.Equal(msg.To.Bytes(), recipient.Bytes()) {`
	`319`	`+ t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, msg.To)`
`320`	`320`	`}`
`321`		`- if !bytes.Equal(call.Data, txData) {`
	`321`	`+ if !bytes.Equal(msg.Data, txData) {`
`322`	`322`	`t.Fatal("estimating with wrong data")`
`323`	`323`	`}`
`324`	`324`	`return estimatedGasLimit, nil`
`@@ -396,11 +396,11 @@ func TestTransactionSend(t *testing.T) {`
`396`	`396`	`}`
`397`	`397`	`return nil`
`398`	`398`	`}),`
`399`		`- backendmock.WithEstimateGasFunc(func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {`
`400`		`- if !bytes.Equal(call.To.Bytes(), recipient.Bytes()) {`
`401`		`- t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, call.To)`
	`399`	`+ backendmock.WithEstimateGasAtBlockFunc(func(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error) {`
	`400`	`+ if !bytes.Equal(msg.To.Bytes(), recipient.Bytes()) {`
	`401`	`+ t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, msg.To)`
`402`	`402`	`}`
`403`		`- if !bytes.Equal(call.Data, txData) {`
	`403`	`+ if !bytes.Equal(msg.Data, txData) {`
`404`	`404`	`t.Fatal("estimating with wrong data")`
`405`	`405`	`}`
`406`	`406`	`return estimatedGasLimit, nil`
`@@ -461,7 +461,7 @@ func TestTransactionSend(t *testing.T) {`
`461`	`461`	`}`
`462`	`462`	`return nil`
`463`	`463`	`}),`
`464`		`- backendmock.WithEstimateGasFunc(func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {`
	`464`	`+ backendmock.WithEstimateGasAtBlockFunc(func(ctx context.Context, call ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error) {`
`465`	`465`	`if !bytes.Equal(call.To.Bytes(), recipient.Bytes()) {`
`466`	`466`	`t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, call.To)`
`467`	`467`	`}`
`@@ -527,7 +527,7 @@ func TestTransactionSend(t *testing.T) {`
`527`	`527`	`}`
`528`	`528`	`return nil`
`529`	`529`	`}),`
`530`		`- backendmock.WithEstimateGasFunc(func(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {`
	`530`	`+ backendmock.WithEstimateGasAtBlockFunc(func(ctx context.Context, call ethereum.CallMsg, blockNumber *big.Int) (gas uint64, err error) {`
`531`	`531`	`if !bytes.Equal(call.To.Bytes(), recipient.Bytes()) {`
`532`	`532`	`t.Fatalf("estimating with wrong recipient. wanted %x, got %x", recipient, call.To)`
`533`	`533`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,11 +138,10 @@ func (b wrappedBackend) SuggestGasTipCap(ctx context.Context) (big.Int, error)`
`138`	`138`	`}`
`139`	`139`	`return gasTipCap, nil`
`140`	`140`	`}`
`141`		`-`
`142`		`-func (b *wrappedBackend) EstimateGas(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error) {`
	`141`	`+func (b wrappedBackend) EstimateGasAtBlock(ctx context.Context, msg ethereum.CallMsg, blockNumber big.Int) (uint64, error) {`
`143`	`142`	`b.metrics.TotalRPCCalls.Inc()`
`144`	`143`	`b.metrics.EstimateGasCalls.Inc()`
`145`		`- gas, err = b.backend.EstimateGas(ctx, call)`
	`144`	`+ gas, err := b.backend.EstimateGasAtBlock(ctx, msg, blockNumber)`
`146`	`145`	`if err != nil {`
`147`	`146`	`b.metrics.TotalRPCErrors.Inc()`
`148`	`147`	`return 0, err`