From 94279d5157dad4abe9d7656b9c99ae5e7a68e01b Mon Sep 17 00:00:00 2001 From: zhiqiangxu <652732310@qq.com> Date: Sat, 9 Mar 2024 05:36:32 +0800 Subject: [PATCH] `l2ImmutableDeployer` : remove contracts with no immutable (#9723) * remove contracts with no immutable * there are 6 upgrade txs * break early --- op-chain-ops/immutables/immutables.go | 8 -------- op-chain-ops/state/state.go | 1 + op-node/rollup/derive/ecotone_upgrade_transactions.go | 2 +- 3 files changed, 2 insertions(+), 9 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 { 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 == "" { 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(),