From 682ae838b2312a4ec8e5581069039b567e33c7c2 Mon Sep 17 00:00:00 2001
From: SangIlMo <156392700+SangIlMo@users.noreply.github.com>
Date: Tue, 4 Jun 2024 16:59:41 +0900
Subject: [PATCH] internal/ethapi: recap higher args.Gas with block GasLimit in
 DoEstimateGas (#29738)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* internal/ethapi: recap higher args.Gas with block GasLimit in DoEstimateGas

* internal/ethapi: fix gas estimator capping code

* internal/ethapi: fix test

* fix goimports lint (remove space)

---------

Co-authored-by: Péter Szilágyi <peterke@gmail.com>
---
 internal/ethapi/api.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index 8866a5b870..f211dcc659 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -1199,10 +1199,16 @@ func DoEstimateGas(ctx context.Context, b Backend, args TransactionArgs, blockNr
 		State:      state,
 		ErrorRatio: estimateGasErrorRatio,
 	}
+	// Set any required transaction default, but make sure the gas cap itself is not messed with
+	// if it was not specified in the original argument list.
+	if args.Gas == nil {
+		args.Gas = new(hexutil.Uint64)
+	}
 	if err := args.CallDefaults(gasCap, header.BaseFee, b.ChainConfig().ChainID); err != nil {
 		return 0, err
 	}
 	call := args.ToMessage(header.BaseFee)
+
 	// Run the gas estimation and wrap any revertals into a custom return
 	estimate, revert, err := gasestimator.Estimate(ctx, call, opts, gasCap)
 	if err != nil {