Skip to content

Commit 7d4e86b

Browse files
mslippersmartcontracts
authored andcommitted
op-deployer: Support single ASR
1 parent 851552b commit 7d4e86b

File tree

15 files changed

+46
-518
lines changed

15 files changed

+46
-518
lines changed

op-chain-ops/interopgen/deploy.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func DeployL2ToL1(l1Host *script.Host, superCfg *SuperchainConfig, superDeployme
199199

200200
l1Host.SetTxOrigin(cfg.Deployer)
201201

202-
output, err := opcm.DeployOPChainV160(l1Host, opcm.DeployOPChainInputV160{
202+
output, err := opcm.DeployOPChain(l1Host, opcm.DeployOPChainInput{
203203
OpChainProxyAdminOwner: cfg.ProxyAdminOwner,
204204
SystemConfigOwner: cfg.SystemConfigOwner,
205205
Batcher: cfg.BatchSenderAddress,
@@ -218,7 +218,6 @@ func DeployL2ToL1(l1Host *script.Host, superCfg *SuperchainConfig, superDeployme
218218
DisputeSplitDepth: cfg.DisputeSplitDepth,
219219
DisputeClockExtension: cfg.DisputeClockExtension,
220220
DisputeMaxClockDuration: cfg.DisputeMaxClockDuration,
221-
StartingAnchorRoots: opcm.PermissionedGameStartingAnchorRoots,
222221
})
223222
if err != nil {
224223
return nil, fmt.Errorf("failed to deploy L2 OP chain: %w", err)

op-chain-ops/interopgen/deployments.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ type Implementations struct {
2020
L1StandardBridgeImpl common.Address `json:"L1StandardBridgeImpl"`
2121
OptimismMintableERC20FactoryImpl common.Address `json:"OptimismMintableERC20FactoryImpl"`
2222
DisputeGameFactoryImpl common.Address `json:"DisputeGameFactoryImpl"`
23+
AnchorStateRegistryImpl common.Address `json:"AnchorStateRegistryImpl"`
2324
}
2425

2526
type SuperchainDeployment struct {

op-deployer/pkg/deployer/bootstrap/flags.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,6 @@ var (
224224
}
225225
)
226226

227-
var OPCMFlags = []cli.Flag{
228-
deployer.L1RPCURLFlag,
229-
deployer.PrivateKeyFlag,
230-
ReleaseFlag,
231-
OutfileFlag,
232-
}
233-
234227
var ImplementationsFlags = []cli.Flag{
235228
MIPSVersionFlag,
236229
WithdrawalDelaySecondsFlag,
@@ -302,12 +295,6 @@ var SuperchainFlags = []cli.Flag{
302295
}
303296

304297
var Commands = []*cli.Command{
305-
{
306-
Name: "opcm",
307-
Usage: "Bootstrap an instance of OPCM.",
308-
Flags: cliapp.ProtectFlags(OPCMFlags),
309-
Action: OPCMCLI,
310-
},
311298
{
312299
Name: "implementations",
313300
Usage: "Bootstraps implementations.",

op-deployer/pkg/deployer/bootstrap/superchain_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ import (
1818
"github.com/stretchr/testify/require"
1919
)
2020

21+
var networks = []string{"mainnet", "sepolia"}
22+
23+
var versions = []string{"v1.8.0-rc.4", "v1.6.0"}
24+
2125
func TestSuperchain(t *testing.T) {
2226
for _, network := range networks {
2327
for _, version := range versions {

0 commit comments

Comments
 (0)