From f74a582ed5c5fa5c168896966f6e2b8dc53feec9 Mon Sep 17 00:00:00 2001
From: Daniel Liu <liudaniel@qq.com>
Date: Mon, 10 Jun 2024 14:02:20 +0800
Subject: [PATCH] internal/ethapi: don't estimate gas if no limit provided in
 eth_createAccessList (#25467)

---
 internal/ethapi/api.go | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index 33d6307b4908..96a88f7bdbf8 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -2020,9 +2020,11 @@ func AccessList(ctx context.Context, b Backend, blockNrOrHash rpc.BlockNumberOrH
 	}
 	owner := common.Address{}
 
-	// If the gas amount is not set, extract this as it will depend on access
-	// lists and we'll need to reestimate every time
-	nogas := args.Gas == nil
+	// If the gas amount is not set, default to RPC gas cap.
+	if args.Gas == nil {
+		tmp := hexutil.Uint64(b.RPCGasCap())
+		args.Gas = &tmp
+	}
 
 	// Ensure any missing fields are filled, extract the recipient and input data
 	if err := args.setDefaults(ctx, b); err != nil {
@@ -2047,15 +2049,6 @@ func AccessList(ctx context.Context, b Backend, blockNrOrHash rpc.BlockNumberOrH
 		accessList := prevTracer.AccessList()
 		log.Trace("Creating access list", "input", accessList)
 
-		// If no gas amount was specified, each unique access list needs it's own
-		// gas calculation. This is quite expensive, but we need to be accurate
-		// and it's convered by the sender only anyway.
-		if nogas {
-			args.Gas = nil
-			if err := args.setDefaults(ctx, b); err != nil {
-				return nil, 0, nil, err // shouldn't happen, just in case
-			}
-		}
 		// Copy the original db so we don't modify it
 		statedb := db.Copy()
 		// Set the accesslist to the last al