From 593059d52f2bd553909f01b36d3aa3bf2e6c8ca5 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Mon, 4 Mar 2024 21:28:07 +0800
Subject: [PATCH 1/3] remove contracts with no immutable

---
 op-chain-ops/immutables/immutables.go | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/op-chain-ops/immutables/immutables.go b/op-chain-ops/immutables/immutables.go
index a3f9697936b5..ac945b77a337 100644
--- a/op-chain-ops/immutables/immutables.go
+++ b/op-chain-ops/immutables/immutables.go
@@ -192,10 +192,6 @@ func l2ImmutableDeployer(backend *backends.SimulatedBackend, opts *bind.Transact
 	}
 
 	switch deployment.Name {
-	case "L2CrossDomainMessenger":
-		_, tx, _, err = bindings.DeployL2CrossDomainMessenger(opts, backend)
-	case "L2StandardBridge":
-		_, tx, _, err = bindings.DeployL2StandardBridge(opts, backend)
 	case "SequencerFeeVault":
 		recipient, minimumWithdrawalAmount, withdrawalNetwork, err = prepareFeeVaultArguments(deployment)
 		if err != nil {
@@ -214,10 +210,6 @@ func l2ImmutableDeployer(backend *backends.SimulatedBackend, opts *bind.Transact
 			return nil, err
 		}
 		_, tx, _, err = bindings.DeployL1FeeVault(opts, backend, recipient, minimumWithdrawalAmount, withdrawalNetwork)
-	case "OptimismMintableERC20Factory":
-		_, tx, _, err = bindings.DeployOptimismMintableERC20Factory(opts, backend)
-	case "L2ERC721Bridge":
-		_, tx, _, err = bindings.DeployL2ERC721Bridge(opts, backend)
 	case "OptimismMintableERC721Factory":
 		bridge, ok := deployment.Args[0].(common.Address)
 		if !ok {

From 222143007586dbcebb22fa655b2fb60e9dca495d Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Mon, 4 Mar 2024 21:59:28 +0800
Subject: [PATCH 2/3] there are 6 upgrade txs

---
 op-node/rollup/derive/ecotone_upgrade_transactions.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/op-node/rollup/derive/ecotone_upgrade_transactions.go b/op-node/rollup/derive/ecotone_upgrade_transactions.go
index 4b709c37c5c4..7b0d885025af 100644
--- a/op-node/rollup/derive/ecotone_upgrade_transactions.go
+++ b/op-node/rollup/derive/ecotone_upgrade_transactions.go
@@ -42,7 +42,7 @@ var (
 )
 
 func EcotoneNetworkUpgradeTransactions() ([]hexutil.Bytes, error) {
-	upgradeTxns := make([]hexutil.Bytes, 0, 5)
+	upgradeTxns := make([]hexutil.Bytes, 0, 6)
 
 	deployL1BlockTransaction, err := types.NewTx(&types.DepositTx{
 		SourceHash:          deployL1BlockSource.SourceHash(),

From f5e96ef51ad76db413d4598c1c2b5cab6bc198df Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Mon, 4 Mar 2024 22:56:49 +0800
Subject: [PATCH 3/3] break early

---
 op-chain-ops/state/state.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/op-chain-ops/state/state.go b/op-chain-ops/state/state.go
index 96156f1c13c5..b3788081c0cf 100644
--- a/op-chain-ops/state/state.go
+++ b/op-chain-ops/state/state.go
@@ -73,6 +73,7 @@ func ComputeStorageSlots(layout *solc.StorageLayout, values StorageValues) ([]*E
 		for _, entry := range layout.Storage {
 			if label == entry.Label {
 				target = entry
+				break
 			}
 		}
 		if target.Label == "" {