Commit 9425336b authored by Mark Tyneway's avatar Mark Tyneway

system: fix build

parent 084562a5
...@@ -63,6 +63,7 @@ type DeployConfig struct { ...@@ -63,6 +63,7 @@ type DeployConfig struct {
L2GenesisBlockParentHash common.Hash `json:"l2GenesisBlockParentHash"` L2GenesisBlockParentHash common.Hash `json:"l2GenesisBlockParentHash"`
L2GenesisBlockBaseFeePerGas *hexutil.Big `json:"l2GenesisBlockBaseFeePerGas"` L2GenesisBlockBaseFeePerGas *hexutil.Big `json:"l2GenesisBlockBaseFeePerGas"`
ProxyAdminOwner common.Address `json:"proxyAdminOwner"`
L2CrossDomainMessengerOwner common.Address `json:"l2CrossDomainMessengerOwner"` L2CrossDomainMessengerOwner common.Address `json:"l2CrossDomainMessengerOwner"`
OptimismBaseFeeRecipient common.Address `json:"optimismBaseFeeRecipient"` OptimismBaseFeeRecipient common.Address `json:"optimismBaseFeeRecipient"`
OptimismL1FeeRecipient common.Address `json:"optimismL1FeeRecipient"` OptimismL1FeeRecipient common.Address `json:"optimismL1FeeRecipient"`
......
...@@ -57,13 +57,7 @@ var Subcommands = cli.Commands{ ...@@ -57,13 +57,7 @@ var Subcommands = cli.Commands{
} }
l1StartBlock := l1Genesis.ToBlock() l1StartBlock := l1Genesis.ToBlock()
l2Addrs := &genesis.L2Addresses{ l2Genesis, err := genesis.BuildL2DeveloperGenesis(config, l1StartBlock, nil)
ProxyAdmin: predeploys.DevProxyAdminAddr,
L1StandardBridgeProxy: predeploys.DevL1StandardBridgeAddr,
L1CrossDomainMessengerProxy: predeploys.DevL1CrossDomainMessengerAddr,
L1ERC721BridgeProxy: predeploys.DevL1ERC721BridgeAddr,
}
l2Genesis, err := genesis.BuildL2DeveloperGenesis(config, l1StartBlock, l2Addrs)
if err != nil { if err != nil {
return err return err
} }
...@@ -136,10 +130,6 @@ var Subcommands = cli.Commands{ ...@@ -136,10 +130,6 @@ var Subcommands = cli.Commands{
return err return err
} }
proxyAdmin, err := hh.GetDeployment("ProxyAdmin")
if err != nil {
return err
}
l1SBP, err := hh.GetDeployment("L1StandardBridgeProxy") l1SBP, err := hh.GetDeployment("L1StandardBridgeProxy")
if err != nil { if err != nil {
return err return err
...@@ -158,7 +148,7 @@ var Subcommands = cli.Commands{ ...@@ -158,7 +148,7 @@ var Subcommands = cli.Commands{
} }
l2Addrs := &genesis.L2Addresses{ l2Addrs := &genesis.L2Addresses{
ProxyAdmin: proxyAdmin.Address, ProxyAdminOwner: config.ProxyAdminOwner,
L1StandardBridgeProxy: l1SBP.Address, L1StandardBridgeProxy: l1SBP.Address,
L1CrossDomainMessengerProxy: l1XDMP.Address, L1CrossDomainMessengerProxy: l1XDMP.Address,
L1ERC721BridgeProxy: l1ERC721BP.Address, L1ERC721BridgeProxy: l1ERC721BP.Address,
......
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