Skip to content

Commit c04ba87

Browse files
committed
WIP: fix build
1 parent 559cb86 commit c04ba87

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

op-deployer/pkg/deployer/inspect/genesis.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ package inspect
33
import (
44
"fmt"
55

6+
"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
67
"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/pipeline"
8+
"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/state"
9+
"github.com/ethereum-optimism/optimism/op-node/rollup"
10+
"github.com/ethereum/go-ethereum/common"
11+
"github.com/ethereum/go-ethereum/core"
712

813
"github.com/ethereum-optimism/optimism/op-service/ioutil"
914
"github.com/ethereum-optimism/optimism/op-service/jsonutil"

op-deployer/pkg/deployer/pipeline/env.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@ func RenderGenesisAndRollup(globalState *state.State, chainID common.Hash, useGl
113113
return nil, nil, fmt.Errorf("failed to combine L2 init config: %w", err)
114114
}
115115

116-
l2GenesisBuilt, err := genesis.BuildL2Genesis(&config, l2Allocs, chainState.StartBlock)
116+
l2GenesisBuilt, err := genesis.BuildL2Genesis(&config, l2Allocs, chainState.StartBlock.ToBlockRef())
117117
if err != nil {
118118
return nil, nil, fmt.Errorf("failed to build L2 genesis: %w", err)
119119
}
120120
l2GenesisBlock := l2GenesisBuilt.ToBlock()
121121

122122
rollupConfig, err := config.RollupConfig(
123-
chainState.StartBlock,
123+
chainState.StartBlock.ToBlockRef(),
124124
l2GenesisBlock.Hash(),
125125
l2GenesisBlock.Number().Uint64(),
126126
)

ops/docker/op-stack-go/Dockerfile.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*
44

55
!/cannon
6+
!/devnet-sdk
67
!/op-batcher
78
!/op-chain-ops
89
!/op-deployer

0 commit comments

Comments
 (0)