Skip to content

Fix Optimism Config in L2 Genesis builder #3075

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

Merged
mergify merged 5 commits into from
Jul 21, 2022
Merged

Fix Optimism Config in L2 Genesis builder #3075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
030761c
Fix Optimism Config in L2 Genesis builder
trianglesphere Jul 21, 2022
1e35141
packages/core-utils: bedrock config type fix
protolambda Jul 21, 2022
f25fa68
packages/contracts-bedrock: update genesis l2 task import
protolambda Jul 21, 2022
1c06640
packages/core-utils: bedrock - remove old todo comment
protolambda Jul 21, 2022
b4e78dd
Merge branch 'develop' into jg/fix_l2_genesis_builder
mergify[bot] Jul 21, 2022
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
11 changes: 3 additions & 8 deletions packages/contracts-bedrock/tasks/genesis-l2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,21 +290,16 @@ task('genesis-l2', 'create a genesis config')
londonBlock: 0,
mergeNetsplitBlock: 0,
terminalTotalDifficulty: 0,
clique: {
period: 0,
epoch: 30000,
optimism: {
baseFeeRecipient: deployConfig.optimismBaseFeeRecipient,
l1FeeRecipient: deployConfig.optimismL1FeeRecipient,
},
},
nonce: '0x1234',
difficulty: '0x1',
timestamp: ethers.BigNumber.from(l1StartingBlock.timestamp).toHexString(),
gasLimit: deployConfig.genesisBlockGasLimit,
extraData: deployConfig.genesisBlockExtradata,
optimism: {
enabled: true,
baseFeeRecipient: deployConfig.optimismBaseFeeRecipient,
l1FeeRecipient: deployConfig.optimismL1FeeRecipient,
},
alloc,
}

Expand Down
11 changes: 6 additions & 5 deletions packages/core-utils/src/external/geth/geth-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,16 @@ export interface Genesis {
/**
* Represents the chain config for an Optimism chain
*/
export interface OptimismChainConfig {
enabled: boolean
baseFeeRecipient: string
l1FeeRecipient: string
export interface OptimismChainConfig extends ChainConfig {
optimism: {
baseFeeRecipient: string
l1FeeRecipient: string
}
}

/**
* Represents the Genesis file format for an Optimism chain
*/
export interface OptimismGenesis extends Genesis {
optimism: OptimismChainConfig
config: OptimismChainConfig
}