internal/ethapi: set default fees before gas estimation

Author: txhsl

eth/gasestimator/gasestimator.go

@@ -75,7 +75,7 @@ func Estimate(ctx context.Context, call *core.Message, opts *Options, gasCap uin
 
 		available := balance
 		if call.Value != nil {
-			if call.Value.Cmp(available) >= 0 {
+			if call.Value.Cmp(available) > 0 {
 				return 0, nil, core.ErrInsufficientFundsForTransfer
 			}
 			available.Sub(available, call.Value)

internal/ethapi/api.go

@@ -1284,6 +1284,9 @@ func DoEstimateGas(ctx context.Context, b Backend, args TransactionArgs, blockNr
 // configuration (if non-zero).
 // Note: Required blob gas is not computed in this method.
 func (s *BlockChainAPI) EstimateGas(ctx context.Context, args TransactionArgs, blockNrOrHash *rpc.BlockNumberOrHash, overrides *StateOverride) (hexutil.Uint64, error) {
+	if err := args.setFeeDefaults(ctx, s.b); err != nil {
+		return 0, err
+	}
 	bNrOrHash := rpc.BlockNumberOrHashWithNumber(rpc.LatestBlockNumber)
 	if blockNrOrHash != nil {
 		bNrOrHash = *blockNrOrHash

internal/ethapi/api_test.go

@@ -671,19 +671,19 @@ func TestEstimateGas(t *testing.T) {
 				To:    &accounts[1].addr,
 				Value: (*hexutil.Big)(big.NewInt(1000)),
 			},
-			expectErr: core.ErrInsufficientFunds,
-			want:      21000,
+			expectErr: core.ErrInsufficientFundsForTransfer,
 		},
 		// empty create
 		{
 			blockNumber: rpc.LatestBlockNumber,
 			call:        TransactionArgs{},
-			expectErr:   nil,
-			want:        53000,
+			expectErr:   errors.New("gas required exceeds allowance (0)"),
 		},
 		{
 			blockNumber: rpc.LatestBlockNumber,
-			call:        TransactionArgs{},
+			call: TransactionArgs{
+				From: &randomAccounts[0].addr,
+			},
 			overrides: StateOverride{
 				randomAccounts[0].addr: OverrideAccount{Balance: newRPCBalance(new(big.Int).Mul(big.NewInt(1), big.NewInt(params.Ether)))},
 			},
@@ -700,7 +700,7 @@ func TestEstimateGas(t *testing.T) {
 			overrides: StateOverride{
 				randomAccounts[0].addr: OverrideAccount{Balance: newRPCBalance(big.NewInt(0))},
 			},
-			expectErr: core.ErrInsufficientFunds,
+			expectErr: core.ErrInsufficientFundsForTransfer,
 		},
 		// Test for a bug where the gas price was set to zero but the basefee non-zero
 		//
@@ -763,7 +763,7 @@ func TestEstimateGas(t *testing.T) {
 				t.Errorf("test %d: want error %v, have nothing", i, tc.expectErr)
 				continue
 			}
-			if !errors.Is(err, tc.expectErr) {
+			if !errors.Is(err, tc.expectErr) && err.Error() != tc.expectErr.Error() {
 				t.Errorf("test %d: error mismatch, want %v, have %v", i, tc.expectErr, err)
 			}
 			continue