Merge branch 'master' into metrics

OffchainLabs · Jul 11, 2024 · 20441ba · 20441ba
2 parents 0e9f589 + e52de0a
commit 20441ba
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/.github/workflows/merge-checks.yml b/.github/workflows/merge-checks.yml
@@ -1,7 +1,7 @@
 name: Merge Checks
 
 on:
-  pull_request:
+  pull_request_target:
     branches: [ master ]
     types: [synchronize, opened, reopened, labeled, unlabeled]
 

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -1285,10 +1285,6 @@ func DoEstimateGas(ctx context.Context, b Backend, args TransactionArgs, blockNr
 
 	// Arbitrum: raise the gas cap to ignore L1 costs so that it's compute-only
 	{
-		state, header, err := b.StateAndHeaderByNumberOrHash(ctx, blockNrOrHash)
-		if state == nil || err != nil {
-			return 0, err
-		}
 		gasCap, err = args.L2OnlyGasCap(gasCap, header, state, core.MessageGasEstimationMode)
 		if err != nil {
 			return 0, err