Skip to content

Commit

Permalink
l2ImmutableDeployer : remove contracts with no immutable (ethereum-…
Browse files Browse the repository at this point in the history
…optimism#9723)

* remove contracts with no immutable

* there are 6 upgrade txs

* break early
  • Loading branch information
zhiqiangxu authored Mar 8, 2024
1 parent 7d3922c commit 94279d5
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
8 changes: 0 additions & 8 deletions op-chain-ops/immutables/immutables.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions op-chain-ops/state/state.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 == "" {
Expand Down
2 changes: 1 addition & 1 deletion op-node/rollup/derive/ecotone_upgrade_transactions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down

0 comments on commit 94279d5

Please sign in to comment.