Skip to content

Commit

Permalink
test(genesis): use monorepo contracts with latest SentMessage impleme…
Browse files Browse the repository at this point in the history 
…ntation
  • Loading branch information
@jakim929
jakim929 committed Aug 1, 2024
1 parent ffa0851 commit 7121b8d
Show file tree
Hide file tree
Showing 35 changed files with 193 additions and 119 deletions.
2 changes: 1 addition & 1 deletion Justfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ checkout-optimism-monorepo:
cd lib/optimism && \
git init && \
git remote add origin https://github.com/ethereum-optimism/optimism.git && \
git fetch --depth=1 origin 9001eef4784dc2950d0bdcda29752cb2939bae2b && \
git fetch --depth=1 origin 6f8aec82035317386aba18212b3beb9e837eece1 && \
git reset --hard FETCH_HEAD && \
git submodule update --init --recursive && \
make cannon-prestate
Expand Down
2 changes: 1 addition & 1 deletion genesis/generated/addresses/901-addresses.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"L1StandardBridgeProxy": "0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1",
"L2OutputOracle": "0x19652082F846171168Daf378C4fD3ee85a0D4A60",
"L2OutputOracleProxy": "0x59b670e9fA9D0A427751Af201D676719a970857b",
"Mips": "0xcdAdd729ca2319E8955240bDb61A6A6A956A7664",
"Mips": "0xB3A0348310a0ff78E5FbDB7f14BB7d3e02d40773",
"OptimismMintableERC20Factory": "0x39Aea2Dd53f2d01c15877aCc2791af6BDD7aD567",
"OptimismMintableERC20FactoryProxy": "0x68B1D87F95878fE05B998F19b66F4baba5De1aed",
"OptimismPortal": "0xb7461Fb347f68f9717e6fD12C8407dEcee063bdc",
Expand Down
2 changes: 1 addition & 1 deletion genesis/generated/addresses/902-addresses.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"L1StandardBridgeProxy": "0xe6b98F104c1BEf218F3893ADab4160Dc73Eb8367",
"L2OutputOracle": "0x19652082F846171168Daf378C4fD3ee85a0D4A60",
"L2OutputOracleProxy": "0xAfe1b5bdEbD4ae65AF2024738bf0735fbb65d44b",
"Mips": "0xcdAdd729ca2319E8955240bDb61A6A6A956A7664",
"Mips": "0xB3A0348310a0ff78E5FbDB7f14BB7d3e02d40773",
"OptimismMintableERC20Factory": "0x39Aea2Dd53f2d01c15877aCc2791af6BDD7aD567",
"OptimismMintableERC20FactoryProxy": "0x0D4ff719551E23185Aeb16FFbF2ABEbB90635942",
"OptimismPortal": "0xb7461Fb347f68f9717e6fD12C8407dEcee063bdc",
Expand Down
2 changes: 1 addition & 1 deletion genesis/generated/addresses/903-addresses.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"L1StandardBridgeProxy": "0x36B22905A1211A55E0d62eF46720172e2b0f24BD",
"L2OutputOracle": "0x19652082F846171168Daf378C4fD3ee85a0D4A60",
"L2OutputOracleProxy": "0x029A31eDd4C791C99387B318cbc352EA4D3f64bf",
"Mips": "0xcdAdd729ca2319E8955240bDb61A6A6A956A7664",
"Mips": "0xB3A0348310a0ff78E5FbDB7f14BB7d3e02d40773",
"OptimismMintableERC20Factory": "0x39Aea2Dd53f2d01c15877aCc2791af6BDD7aD567",
"OptimismMintableERC20FactoryProxy": "0x050499eBdbBBc1216011dE07A48b5182c983Ae74",
"OptimismPortal": "0xb7461Fb347f68f9717e6fD12C8407dEcee063bdc",
Expand Down
2 changes: 1 addition & 1 deletion genesis/generated/addresses/904-addresses.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"L1StandardBridgeProxy": "0xfe36E31dFE8Cb3A3Aa0CB9f35B191DdB5451b090",
"L2OutputOracle": "0x19652082F846171168Daf378C4fD3ee85a0D4A60",
"L2OutputOracleProxy": "0xfcF38f326CA709b0B04B2215Dbc969fC622775F7",
"Mips": "0xcdAdd729ca2319E8955240bDb61A6A6A956A7664",
"Mips": "0xB3A0348310a0ff78E5FbDB7f14BB7d3e02d40773",
"OptimismMintableERC20Factory": "0x39Aea2Dd53f2d01c15877aCc2791af6BDD7aD567",
"OptimismMintableERC20FactoryProxy": "0x072B5bdBFC5e66B55317Ef4B4d1AE7d61592ebB2",
"OptimismPortal": "0xb7461Fb347f68f9717e6fD12C8407dEcee063bdc",
Expand Down
2 changes: 1 addition & 1 deletion genesis/generated/addresses/905-addresses.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"L1StandardBridgeProxy": "0x0635605d7cd6d565Ab8088cC15e45A927c139d3E",
"L2OutputOracle": "0x19652082F846171168Daf378C4fD3ee85a0D4A60",
"L2OutputOracleProxy": "0x6e7cfe3fd749F6E1C53BC1065fc702eb6c22F600",
"Mips": "0xcdAdd729ca2319E8955240bDb61A6A6A956A7664",
"Mips": "0xB3A0348310a0ff78E5FbDB7f14BB7d3e02d40773",
"OptimismMintableERC20Factory": "0x39Aea2Dd53f2d01c15877aCc2791af6BDD7aD567",
"OptimismMintableERC20FactoryProxy": "0x88dD21924FbEeccC4dC8Ae3a0e207ecCA03c5b92",
"OptimismPortal": "0xb7461Fb347f68f9717e6fD12C8407dEcee063bdc",
Expand Down
14 changes: 7 additions & 7 deletions genesis/generated/deploy-configs/901-deploy-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@
"p2pSequencerAddress": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
"batchInboxAddress": "0xff00000000000000000000000000000000000901",
"batchSenderAddress": "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
"cliqueSignerAddress": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
"l1UseClique": true,
"l1StartingBlockTag": "earliest",
"l2OutputOracleSubmissionInterval": 10,
"l2OutputOracleStartingTimestamp": 0,
"l2OutputOracleStartingBlockNumber": 0,
"l2OutputOracleProposer": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
"l2OutputOracleChallenger": "0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65",
"l2GenesisBlockGasLimit": "0x1c9c380",
"l1BlockTime": 3,
"l1BlockTime": 6,
"baseFeeVaultRecipient": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955",
"l1FeeVaultRecipient": "0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f",
"sequencerFeeVaultRecipient": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
Expand All @@ -44,10 +42,12 @@
"eip1559Denominator": 50,
"eip1559DenominatorCanyon": 250,
"eip1559Elasticity": 6,
"l1GenesisBlockTimestamp": "0x64c811bf",
"l1GenesisBlockTimestamp": "0x123",
"l2GenesisRegolithTimeOffset": "0x0",
"l2GenesisDeltaTimeOffset": null,
"l2GenesisCanyonTimeOffset": "0x0",
"l2GenesisDeltaTimeOffset": "0x0",
"l2GenesisEcotoneTimeOffset": "0x40",
"l1CancunTimeOffset": "0x30",
"systemConfigStartBlock": 0,
"requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
Expand All @@ -67,8 +67,8 @@
"useFaultProofs": true,
"usePlasma": false,
"daCommitmentType": "KeccakCommitment",
"daChallengeWindow": 160,
"daResolveWindow": 160,
"daChallengeWindow": 16,
"daResolveWindow": 16,
"daBondSize": 1000000,
"daResolverRefundPercentage": 0,
"useInterop": true
Expand Down
14 changes: 7 additions & 7 deletions genesis/generated/deploy-configs/902-deploy-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@
"p2pSequencerAddress": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
"batchInboxAddress": "0xff00000000000000000000000000000000000901",
"batchSenderAddress": "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
"cliqueSignerAddress": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
"l1UseClique": true,
"l1StartingBlockTag": "earliest",
"l2OutputOracleSubmissionInterval": 10,
"l2OutputOracleStartingTimestamp": 0,
"l2OutputOracleStartingBlockNumber": 0,
"l2OutputOracleProposer": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
"l2OutputOracleChallenger": "0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65",
"l2GenesisBlockGasLimit": "0x1c9c380",
"l1BlockTime": 3,
"l1BlockTime": 6,
"baseFeeVaultRecipient": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955",
"l1FeeVaultRecipient": "0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f",
"sequencerFeeVaultRecipient": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
Expand All @@ -44,10 +42,12 @@
"eip1559Denominator": 50,
"eip1559DenominatorCanyon": 250,
"eip1559Elasticity": 6,
"l1GenesisBlockTimestamp": "0x64c811bf",
"l1GenesisBlockTimestamp": "0x123",
"l2GenesisRegolithTimeOffset": "0x0",
"l2GenesisDeltaTimeOffset": null,
"l2GenesisCanyonTimeOffset": "0x0",
"l2GenesisDeltaTimeOffset": "0x0",
"l2GenesisEcotoneTimeOffset": "0x40",
"l1CancunTimeOffset": "0x30",
"systemConfigStartBlock": 0,
"requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
Expand All @@ -67,8 +67,8 @@
"useFaultProofs": true,
"usePlasma": false,
"daCommitmentType": "KeccakCommitment",
"daChallengeWindow": 160,
"daResolveWindow": 160,
"daChallengeWindow": 16,
"daResolveWindow": 16,
"daBondSize": 1000000,
"daResolverRefundPercentage": 0,
"useInterop": true
Expand Down
14 changes: 7 additions & 7 deletions genesis/generated/deploy-configs/903-deploy-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@
"p2pSequencerAddress": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
"batchInboxAddress": "0xff00000000000000000000000000000000000901",
"batchSenderAddress": "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
"cliqueSignerAddress": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
"l1UseClique": true,
"l1StartingBlockTag": "earliest",
"l2OutputOracleSubmissionInterval": 10,
"l2OutputOracleStartingTimestamp": 0,
"l2OutputOracleStartingBlockNumber": 0,
"l2OutputOracleProposer": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
"l2OutputOracleChallenger": "0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65",
"l2GenesisBlockGasLimit": "0x1c9c380",
"l1BlockTime": 3,
"l1BlockTime": 6,
"baseFeeVaultRecipient": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955",
"l1FeeVaultRecipient": "0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f",
"sequencerFeeVaultRecipient": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
Expand All @@ -44,10 +42,12 @@
"eip1559Denominator": 50,
"eip1559DenominatorCanyon": 250,
"eip1559Elasticity": 6,
"l1GenesisBlockTimestamp": "0x64c811bf",
"l1GenesisBlockTimestamp": "0x123",
"l2GenesisRegolithTimeOffset": "0x0",
"l2GenesisDeltaTimeOffset": null,
"l2GenesisCanyonTimeOffset": "0x0",
"l2GenesisDeltaTimeOffset": "0x0",
"l2GenesisEcotoneTimeOffset": "0x40",
"l1CancunTimeOffset": "0x30",
"systemConfigStartBlock": 0,
"requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
Expand All @@ -67,8 +67,8 @@
"useFaultProofs": true,
"usePlasma": false,
"daCommitmentType": "KeccakCommitment",
"daChallengeWindow": 160,
"daResolveWindow": 160,
"daChallengeWindow": 16,
"daResolveWindow": 16,
"daBondSize": 1000000,
"daResolverRefundPercentage": 0,
"useInterop": true
Expand Down
14 changes: 7 additions & 7 deletions genesis/generated/deploy-configs/904-deploy-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@
"p2pSequencerAddress": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
"batchInboxAddress": "0xff00000000000000000000000000000000000901",
"batchSenderAddress": "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
"cliqueSignerAddress": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
"l1UseClique": true,
"l1StartingBlockTag": "earliest",
"l2OutputOracleSubmissionInterval": 10,
"l2OutputOracleStartingTimestamp": 0,
"l2OutputOracleStartingBlockNumber": 0,
"l2OutputOracleProposer": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
"l2OutputOracleChallenger": "0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65",
"l2GenesisBlockGasLimit": "0x1c9c380",
"l1BlockTime": 3,
"l1BlockTime": 6,
"baseFeeVaultRecipient": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955",
"l1FeeVaultRecipient": "0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f",
"sequencerFeeVaultRecipient": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
Expand All @@ -44,10 +42,12 @@
"eip1559Denominator": 50,
"eip1559DenominatorCanyon": 250,
"eip1559Elasticity": 6,
"l1GenesisBlockTimestamp": "0x64c811bf",
"l1GenesisBlockTimestamp": "0x123",
"l2GenesisRegolithTimeOffset": "0x0",
"l2GenesisDeltaTimeOffset": null,
"l2GenesisCanyonTimeOffset": "0x0",
"l2GenesisDeltaTimeOffset": "0x0",
"l2GenesisEcotoneTimeOffset": "0x40",
"l1CancunTimeOffset": "0x30",
"systemConfigStartBlock": 0,
"requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
Expand All @@ -67,8 +67,8 @@
"useFaultProofs": true,
"usePlasma": false,
"daCommitmentType": "KeccakCommitment",
"daChallengeWindow": 160,
"daResolveWindow": 160,
"daChallengeWindow": 16,
"daResolveWindow": 16,
"daBondSize": 1000000,
"daResolverRefundPercentage": 0,
"useInterop": true
Expand Down
14 changes: 7 additions & 7 deletions genesis/generated/deploy-configs/905-deploy-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,14 @@
"p2pSequencerAddress": "0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc",
"batchInboxAddress": "0xff00000000000000000000000000000000000901",
"batchSenderAddress": "0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC",
"cliqueSignerAddress": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
"l1UseClique": true,
"l1StartingBlockTag": "earliest",
"l2OutputOracleSubmissionInterval": 10,
"l2OutputOracleStartingTimestamp": 0,
"l2OutputOracleStartingBlockNumber": 0,
"l2OutputOracleProposer": "0x70997970C51812dc3A010C7d01b50e0d17dc79C8",
"l2OutputOracleChallenger": "0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65",
"l2GenesisBlockGasLimit": "0x1c9c380",
"l1BlockTime": 3,
"l1BlockTime": 6,
"baseFeeVaultRecipient": "0x14dC79964da2C08b23698B3D3cc7Ca32193d9955",
"l1FeeVaultRecipient": "0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f",
"sequencerFeeVaultRecipient": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
Expand All @@ -44,10 +42,12 @@
"eip1559Denominator": 50,
"eip1559DenominatorCanyon": 250,
"eip1559Elasticity": 6,
"l1GenesisBlockTimestamp": "0x64c811bf",
"l1GenesisBlockTimestamp": "0x123",
"l2GenesisRegolithTimeOffset": "0x0",
"l2GenesisDeltaTimeOffset": null,
"l2GenesisCanyonTimeOffset": "0x0",
"l2GenesisDeltaTimeOffset": "0x0",
"l2GenesisEcotoneTimeOffset": "0x40",
"l1CancunTimeOffset": "0x30",
"systemConfigStartBlock": 0,
"requiredProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
"recommendedProtocolVersion": "0x0000000000000000000000000000000000000000000000000000000000000000",
Expand All @@ -67,8 +67,8 @@
"useFaultProofs": true,
"usePlasma": false,
"daCommitmentType": "KeccakCommitment",
"daChallengeWindow": 160,
"daResolveWindow": 160,
"daChallengeWindow": 16,
"daResolveWindow": 16,
"daBondSize": 1000000,
"daResolverRefundPercentage": 0,
"useInterop": true
Expand Down
2 changes: 1 addition & 1 deletion genesis/generated/l1-allocs/901-l1-allocs.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion genesis/generated/l1-allocs/902-l1-allocs.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion genesis/generated/l1-allocs/903-l1-allocs.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion genesis/generated/l1-allocs/904-l1-allocs.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion genesis/generated/l1-allocs/905-l1-allocs.json
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion genesis/generated/l1-combined-allocs.json
View file

Large diffs are not rendered by default.

92 changes: 70 additions & 22 deletions genesis/generated/l1-genesis.json
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 7121b8d

Please sign in to comment.