Commit 713d950a authored by Mark Tyneway's avatar Mark Tyneway

op-node: cleanup genesis generation script

parent 9be8666f
...@@ -196,7 +196,7 @@ var Subcommands = cli.Commands{ ...@@ -196,7 +196,7 @@ var Subcommands = cli.Commands{
} }
if l1RPC != "" { if l1RPC != "" {
client, err := ethclient.Dial(ctx.String("l1-rpc")) client, err := ethclient.Dial(l1RPC)
if err != nil { if err != nil {
return fmt.Errorf("cannot dial %s: %w", l1RPC, err) return fmt.Errorf("cannot dial %s: %w", l1RPC, err)
} }
...@@ -204,19 +204,19 @@ var Subcommands = cli.Commands{ ...@@ -204,19 +204,19 @@ var Subcommands = cli.Commands{
if config.L1StartingBlockTag == nil { if config.L1StartingBlockTag == nil {
l1StartBlock, err = client.BlockByNumber(context.Background(), nil) l1StartBlock, err = client.BlockByNumber(context.Background(), nil)
if err != nil { if err != nil {
return fmt.Errorf("%w", err) return fmt.Errorf("cannot fetch latest block: %w", err)
} }
tag := rpc.BlockNumberOrHashWithHash(l1StartBlock.Hash(), true) tag := rpc.BlockNumberOrHashWithHash(l1StartBlock.Hash(), true)
config.L1StartingBlockTag = (*genesis.MarshalableRPCBlockNumberOrHash)(&tag) config.L1StartingBlockTag = (*genesis.MarshalableRPCBlockNumberOrHash)(&tag)
} else if config.L1StartingBlockTag.BlockHash != nil { } else if config.L1StartingBlockTag.BlockHash != nil {
l1StartBlock, err = client.BlockByHash(context.Background(), *config.L1StartingBlockTag.BlockHash) l1StartBlock, err = client.BlockByHash(context.Background(), *config.L1StartingBlockTag.BlockHash)
if err != nil { if err != nil {
return fmt.Errorf("%w", err) return fmt.Errorf("cannot fetch block by hash: %w", err)
} }
} else if config.L1StartingBlockTag.BlockNumber != nil { } else if config.L1StartingBlockTag.BlockNumber != nil {
l1StartBlock, err = client.BlockByNumber(context.Background(), big.NewInt(config.L1StartingBlockTag.BlockNumber.Int64())) l1StartBlock, err = client.BlockByNumber(context.Background(), big.NewInt(config.L1StartingBlockTag.BlockNumber.Int64()))
if err != nil { if err != nil {
return fmt.Errorf("%w", err) return fmt.Errorf("cannot fetch block by number: %w", err)
} }
} }
} }
......
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