Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
74 changes: 74 additions & 0 deletions packages/contracts-bedrock/deploy-config/alfajores.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"l1StartingBlockTag": "0x64728368a04f067bc2abe78c1de17f3711b054c4f3e979955fd8482af85e86db",
"l1ChainID": 17000,
"l2ChainID": 44787,
"l2BlockTime": 1,
"l1BlockTime": 12,
"maxSequencerDrift": 1800,
"sequencerWindowSize": 3600,
"channelTimeout": 300,
"p2pSequencerAddress": "0x280F2AB4a7bC6c78bcFFBE91E9E369C5FB4e5a29",
"batchInboxAddress": "0xfff0000000000000000000000000000000044787",
"batchSenderAddress": "0x6f9cc6BfE1A0b446A36453d150905BBD6A4784e0",
"l2OutputOracleSubmissionInterval": 120,
"l2OutputOracleStartingBlockNumber": 26384000,
"l2OutputOracleStartingTimestamp": 1727337408,
"l2OutputOracleProposer": "0x06d010A07D9076d6E7af80E54E26036941221bFA",
"l2OutputOracleChallenger": "0xe571b94CF7e95C46DFe6bEa529335f4A11d15D92",
"finalizationPeriodSeconds": 12,
"proxyAdminOwner": "0xe571b94CF7e95C46DFe6bEa529335f4A11d15D92",
"baseFeeVaultRecipient": "0xe571b94CF7e95C46DFe6bEa529335f4A11d15D92",
"l1FeeVaultRecipient": "0xe571b94CF7e95C46DFe6bEa529335f4A11d15D92",
"sequencerFeeVaultRecipient": "0xe571b94CF7e95C46DFe6bEa529335f4A11d15D92",
"finalSystemOwner": "0xe571b94CF7e95C46DFe6bEa529335f4A11d15D92",
"superchainConfigGuardian": "0xe571b94CF7e95C46DFe6bEa529335f4A11d15D92",
"baseFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
"l1FeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
"sequencerFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
"baseFeeVaultWithdrawalNetwork": 0,
"l1FeeVaultWithdrawalNetwork": 0,
"sequencerFeeVaultWithdrawalNetwork": 0,
"gasPriceOracleOverhead": 0,
"gasPriceOracleScalar": 1000000,
"deployCeloContracts": false,
"enableGovernance": false,
"governanceTokenSymbol": "OP",
"governanceTokenName": "Optimism",
"governanceTokenOwner": "0xe571b94CF7e95C46DFe6bEa529335f4A11d15D92",
"l2GenesisBlockGasLimit": "0x1c9c380",
"l2GenesisBlockBaseFeePerGas": "0x3b9aca00",
"eip1559Denominator": 400,
"eip1559DenominatorCanyon": 400,
"eip1559Elasticity": 5,
"eip1559BaseFeeFloor": 25000000000,
"l2GenesisFjordTimeOffset": "0x0",
"l2GenesisRegolithTimeOffset": "0x0",
"l2GenesisEcotoneTimeOffset": "0x0",
"l2GenesisDeltaTimeOffset": "0x0",
"l2GenesisCanyonTimeOffset": "0x0",
"l2GenesisGraniteTimeOffset": "0x0",
"systemConfigStartBlock": 0,
"requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"faultGameAbsolutePrestate": "0x03c7ae758795765c6664a5d39bf63841c71ff191e9189522bad8ebff5d4eca98",
"faultGameMaxDepth": 44,
"faultGameClockExtension": 0,
"faultGameMaxClockDuration": 1200,
"faultGameGenesisBlock": 0,
"faultGameGenesisOutputRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
"faultGameSplitDepth": 14,
"faultGameWithdrawalDelay": 600,
"preimageOracleMinProposalSize": 1800000,
"preimageOracleChallengePeriod": 300,
"fundDevAccounts": false,
"useFaultProofs": false,
"proofMaturityDelaySeconds": 604800,
"disputeGameFinalityDelaySeconds": 302400,
"respectedGameType": 0,
"useAltDA": true,
"daCommitmentType": "GenericCommitment",
"daChallengeWindow": 1,
"daResolveWindow": 1,
"useCustomGasToken": true,
"customGasTokenAddress": "0x0000000000000000000000000000000000000000"
}
77 changes: 77 additions & 0 deletions packages/contracts-bedrock/deploy-config/baklava.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
{
"l1StartingBlockTag": "0x382262bec314539f272adb4cdc8165f14019586a87a4301402436c7894eefa47",
"l1ChainID": 17000,
"l2ChainID": 62320,
"l2BlockTime": 1,
"l1BlockTime": 12,
"maxSequencerDrift": 600,
"sequencerWindowSize": 7200,
"channelTimeout": 300,
Copy link

@karlb karlb Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the results from https://github.com/celo-org/celo-blockchain-planning/issues/804, I think we can leave this at the default (50). Note: so far nobody reviewed my reasoning in that issue.

"p2pSequencerAddress": "0x4e7361E093De46C2861F8a1A8e7897894a5AB470",
"batchInboxAddress": "0xfff0000000000000000000000000000000062320",
"batchSenderAddress": "0xE48b8F090e87A563D73Df47a2a5db2Fc749DF530",
"l2OutputOracleSubmissionInterval": 600,
"l2OutputOracleStartingBlockNumber": 26831470,
"l2OutputOracleProposer": "0x2786D8ADFF8690FBC2dd28A53Fab3Bafa5AE6233",
"l2OutputOracleChallenger": "0x9e56D6CE53b5fD29528D18bb0002De417977344c",
"finalizationPeriodSeconds": 12,
"proxyAdminOwner": "0xc07C5A1fBF6c7BC6b4f321E7dd031c0E1E98d32d",
"baseFeeVaultRecipient": "0xc07C5A1fBF6c7BC6b4f321E7dd031c0E1E98d32d",
"l1FeeVaultRecipient": "0xc07C5A1fBF6c7BC6b4f321E7dd031c0E1E98d32d",
"sequencerFeeVaultRecipient": "0xc07C5A1fBF6c7BC6b4f321E7dd031c0E1E98d32d",
"finalSystemOwner": "0xc07C5A1fBF6c7BC6b4f321E7dd031c0E1E98d32d",
"superchainConfigGuardian": "0xc07C5A1fBF6c7BC6b4f321E7dd031c0E1E98d32d",
"baseFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
"l1FeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
"sequencerFeeVaultMinimumWithdrawalAmount": "0x8ac7230489e80000",
"baseFeeVaultWithdrawalNetwork": 0,
"l1FeeVaultWithdrawalNetwork": 0,
"sequencerFeeVaultWithdrawalNetwork": 0,
"gasPriceOracleOverhead": 0,
"gasPriceOracleScalar": 0,
"deployCeloContracts": false,
"enableGovernance": false,
"governanceTokenSymbol": "OP",
"governanceTokenName": "Optimism",
"governanceTokenOwner": "0xc07C5A1fBF6c7BC6b4f321E7dd031c0E1E98d32d",
Comment on lines +34 to +36
Copy link

@karlb karlb Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we don't use these, can we remove them? Not that someone thinks we are subject to OP's governance.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'd need to check the code as right now it's required:

    │   ├─ [0] VM::parseJsonUint("<stringified JSON>", "$.sequencerFeeVaultWithdrawalNetwork") [staticcall]
    │   │   └─ ← [Return] 0
    │   ├─ [0] VM::parseJsonString("<stringified JSON>", "$.governanceTokenName") [staticcall]
    │   │   └─ ← [Revert] vm.parseJsonString: path "$.governanceTokenName" must return exactly one JSON value
    │   └─ ← [Revert] vm.parseJsonString: path "$.governanceTokenName" must return exactly one JSON value
    └─ ← [Revert] vm.parseJsonString: path "$.governanceTokenName" must return exactly one JSON value

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, then leave that in. We could consider changing it to obvious placeholders, though.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you configure enableGovernance: false then it will remove this error

enableGovernance = stdJson.readBool(_json, "$.enableGovernance");

"l2GenesisBlockGasLimit": "0x1c9c380",
"l2GenesisBlockBaseFeePerGas": "0x3b9aca00",
"eip1559Denominator": 400,
"eip1559DenominatorCanyon": 400,
"eip1559Elasticity": 5,
"eip1559BaseFeeFloor": 20000000000,
"gasPriceOracleBaseFeeScalar": 0,
"gasPriceOracleBlobBaseFeeScalar": 0,
"l2GenesisFjordTimeOffset": "0x0",
"l2GenesisRegolithTimeOffset": "0x0",
"l2GenesisEcotoneTimeOffset": "0x0",
"l2GenesisDeltaTimeOffset": "0x0",
"l2GenesisCanyonTimeOffset": "0x0",
"l2GenesisGraniteTimeOffset": "0x0",
"systemConfigStartBlock": 0,
"requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"useFaultProofs": true,
"faultGameAbsolutePrestate": "0x0319caf144957a307e887d7af83175af08d007811ee3f0bbf5afeb0774381d45",
"faultGameMaxDepth": 73,
"faultGameClockExtension": 10800,
"faultGameMaxClockDuration": 302400,
"faultGameGenesisBlock": 26831470,
"faultGameGenesisOutputRoot": "0x629dcbfad24fa82ace3d4c79ff1bc524d19bb093e48169130a0714e5e7bd6427",
"faultGameSplitDepth": 30,
"faultGameWithdrawalDelay": 604800,
"respectedGameType": 1,
"preimageOracleMinProposalSize": 126000,
"preimageOracleChallengePeriod": 86400,
"fundDevAccounts": false,
"initializeAnchorStateRegistry": false,
"proofMaturityDelaySeconds": 604800,
"disputeGameFinalityDelaySeconds": 302400,
"useAltDA": true,
"daCommitmentType": "GenericCommitment",
"daChallengeWindow": 1,
"daResolveWindow": 1,
"useCustomGasToken": true,
"customGasTokenAddress": "0x0000000000000000000000000000000000000000",
"l2OutputOracleStartingTimestamp": 1732621632
}
Loading