From f41c60c3444a2d4bc9b96c51681671cabf3521d7 Mon Sep 17 00:00:00 2001
From: Tristan Wilson <twilson@offchainlabs.com>
Date: Mon, 13 Nov 2023 12:28:22 -0800
Subject: [PATCH] Update against latest go-ethereum merge-v1.12.1

---
 go-ethereum                    | 2 +-
 nodeInterface/NodeInterface.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/go-ethereum b/go-ethereum
index 890cbcac4e..be1fd29a26 160000
--- a/go-ethereum
+++ b/go-ethereum
@@ -1 +1 @@
-Subproject commit 890cbcac4ec591088761a3cf2cdec9bf29183cbb
+Subproject commit be1fd29a26173eae9008c33280b2942a86a4b0fc
diff --git a/nodeInterface/NodeInterface.go b/nodeInterface/NodeInterface.go
index 6e2e5650c3..3b377bc5a0 100644
--- a/nodeInterface/NodeInterface.go
+++ b/nodeInterface/NodeInterface.go
@@ -499,7 +499,7 @@ func (n NodeInterface) GasEstimateComponents(
 	block := rpc.BlockNumberOrHashWithHash(n.header.Hash(), false)
 	args := n.messageArgs(evm, value, to, contractCreation, data)
 
-	totalRaw, err := arbitrum.EstimateGas(context, backend, args, block, gasCap)
+	totalRaw, err := arbitrum.EstimateGas(context, backend, args, block, nil, gasCap)
 	if err != nil {
 		return 0, 0, nil, nil, err
 	}