move estimateGasErrorRatio to gasestimator and export it

OffchainLabs · Apr 17, 2024 · 077f2db · 077f2db
1 parent 976a8e9
commit 077f2db
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/eth/gasestimator/gasestimator.go b/eth/gasestimator/gasestimator.go
@@ -32,6 +32,10 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 )
 
+// EstimateGasErrorRatio is the amount of overestimation eth_estimateGas is
+// allowed to produce in order to speed up calculations.
+const EstimateGasErrorRatio = 0.015
+
 // Options are the contextual parameters to execute the requested call.
 //
 // Whilst it would be possible to pass a blockchain object that aggregates all

diff --git a/graphql/graphql_test.go b/graphql/graphql_test.go
@@ -139,8 +139,7 @@ func TestGraphQLBlockSerialization(t *testing.T) {
 		// should return `estimateGas` as decimal
 		{
 			body: `{"query": "{block{ estimateGas(data:{}) }}"}`,
-			// want: `{"data":{"block":{"estimateGas":"0xd221"}}}`, Nitro needs estimateGas to provide exact estimation i.e gasestimatior's ErrorRatio option is zero
-			want: `{"data":{"block":{"estimateGas":"0xcf08"}}}`,
+			want: `{"data":{"block":{"estimateGas":"0xd221"}}}`,
 			code: 200,
 		},
 		// should return `status` as decimal

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -51,10 +51,6 @@ import (
 	"github.com/tyler-smith/go-bip39"
 )
 
-// estimateGasErrorRatio is the amount of overestimation eth_estimateGas is
-// allowed to produce in order to speed up calculations.
-const estimateGasErrorRatio = 0.015
-
 func fallbackClientFor(b Backend, err error) types.FallbackClient {
 	if !errors.Is(err, types.ErrUseFallback) {
 		return nil
@@ -1284,11 +1280,12 @@ func DoEstimateGas(ctx context.Context, b Backend, args TransactionArgs, blockNr
 
 	// Construct the gas estimator option from the user input
 	opts := &gasestimator.Options{
-		Config:  b.ChainConfig(),
-		Chain:   NewChainContext(ctx, b),
-		Header:  header,
-		State:   state,
-		Backend: b,
+		Config:     b.ChainConfig(),
+		Chain:      NewChainContext(ctx, b),
+		Header:     header,
+		State:      state,
+		Backend:    b,
+		ErrorRatio: gasestimator.EstimateGasErrorRatio,
 	}
 	// Run the gas estimation andwrap any revertals into a custom return
 	call, err := args.ToMessage(gasCap, header, state, core.MessageGasEstimationMode)

diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go
@@ -43,6 +43,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/eth/gasestimator"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/internal/blocktest"
@@ -743,7 +744,7 @@ func TestEstimateGas(t *testing.T) {
 			t.Errorf("test %d: want no error, have %v", i, err)
 			continue
 		}
-		if float64(result) > float64(tc.want)*(1+estimateGasErrorRatio) {
+		if float64(result) > float64(tc.want)*(1+gasestimator.EstimateGasErrorRatio) {
 			t.Errorf("test %d, result mismatch, have\n%v\n, want\n%v\n", i, uint64(result), tc.want)
 		}
 	}