Commit 94279d51 authored by zhiqiangxu's avatar zhiqiangxu Committed by GitHub

`l2ImmutableDeployer` : remove contracts with no immutable (#9723)

* remove contracts with no immutable

* there are 6 upgrade txs

* break early
parent 7d3922c8
......@@ -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 {
......
......@@ -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 == "" {
......
......@@ -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(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment