Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

l2ImmutableDeployer : remove contracts with no immutable #9723

Merged
merged 3 commits into from
Mar 8, 2024
+2 −9
Merged

l2ImmutableDeployer : remove contracts with no immutable #9723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
593059d
remove contracts with no immutable
zhiqiangxu Mar 4, 2024
2221430
there are 6 upgrade txs
zhiqiangxu Mar 4, 2024
f5e96ef
break early
zhiqiangxu Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions op-chain-ops/immutables/immutables.go
View file
Open in desktop
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 {
zhiqiangxu marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
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
View file
Open in desktop
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)
ajsutton marked this conversation as resolved.
Show resolved Hide resolved
upgradeTxns := make([]hexutil.Bytes, 0, 6)

deployL1BlockTransaction, err := types.NewTx(&types.DepositTx{
SourceHash: deployL1BlockSource.SourceHash(),
Expand Down