Skip to content
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.

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

[DO NOT MERGE] v1.0.0 rc.2 taiko #6

Closed
wants to merge 36 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
ccb9141
test raiko integration
Brechtpd May 14, 2024
7509ce5
small changes to allow raiko to use reth for proving
Brechtpd May 22, 2024
fbd1411
basic taiko support
Brechtpd May 31, 2024
33fa264
better invalid tx support
Brechtpd Jun 9, 2024
527c342
added full verification of taiko blocks
Brechtpd Jun 14, 2024
8f4da6b
Merge branch 'v1.0.0-rc.2' into raiko-integration
Brechtpd Jun 24, 2024
8f96ef5
disable problematic packages for zkVM
Brechtpd Jun 24, 2024
7d4b05e
disable mdbx by default (specifically requires clang)
Brechtpd Jun 24, 2024
3e6a095
actually disable mdbx correctly
Brechtpd Jun 24, 2024
5248ce8
cleanup diff
Brechtpd Jun 25, 2024
d20c700
undo useless enr package import change
Brechtpd Jun 25, 2024
c73555d
reexport some more packages
Brechtpd Jun 30, 2024
3043c66
support block validation for raiko
Brechtpd Jul 2, 2024
2f655b7
add taiko_dev chain spec
smtmfft Jul 21, 2024
6cc82cf
Merge pull request #25 from taikoxyz/dev-chain-spec
smtmfft Jul 22, 2024
80f3c0b
prepare for ontake upgrade
smtmfft Jul 25, 2024
bf329f4
config fork & add new anchor logic
smtmfft Jul 31, 2024
2535a5d
update anchor def
smtmfft Aug 6, 2024
70c1bab
sync with protocol change
smtmfft Aug 8, 2024
d2598b8
minor refine
smtmfft Aug 9, 2024
2039f41
update cargo lock
smtmfft Aug 10, 2024
919aaf5
Update crates/ethereum-forks/src/hardfork.rs
smtmfft Aug 14, 2024
eaf942a
revert pure fmt change
smtmfft Aug 15, 2024
ba41ea6
switch back to v36-taiko revm
smtmfft Aug 15, 2024
018d2a6
keep reverting fmt changes
smtmfft Aug 16, 2024
910b6f1
Merge pull request #27 from taikoxyz/v1.0.0-rc.2-taiko-ontake
smtmfft Aug 16, 2024
dc49a94
sync anchorV2 structure with taiko-mono
smtmfft Aug 31, 2024
7677f83
Merge pull request #38 from taikoxyz/v1.0.0-rc.2-taiko-ontake
smtmfft Sep 5, 2024
83e3f6a
feat(chainspec): read ontake fork height from env
petarvujovic98 Sep 6, 2024
2808a0e
feat(chainspec): read ontake fork height for all taiko chains
petarvujovic98 Sep 6, 2024
9018d3b
fix(chainspec): revert formatting
petarvujovic98 Sep 9, 2024
17645de
Update crates/chainspec/src/spec.rs
smtmfft Sep 9, 2024
df7e2e6
Update crates/chainspec/src/spec.rs
smtmfft Sep 9, 2024
d967f74
Merge pull request #40 from taikoxyz/ontake-fork-from-env-raiko
smtmfft Sep 9, 2024
a0761f6
fix hekla ontake fork height
smtmfft Sep 11, 2024
d1165aa
Merge pull request #41 from taikoxyz/v1.0.0-rc.2-taiko-ontake
smtmfft Sep 11, 2024
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
180 changes: 119 additions & 61 deletions Cargo.lock

Large diffs are not rendered by default.

21 changes: 17 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,9 @@ revm = { version = "9.0.0", features = [
revm-primitives = { version = "4.0.0", features = [
"std",
], default-features = false }
revm-precompile = { version = "7.0.0", features = [
"std",
], default-features = false }
revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors", rev = "4fe17f0" }

# eth
Expand Down Expand Up @@ -425,6 +428,7 @@ sha2 = { version = "0.10", default-features = false }
paste = "1.0"
url = "2.3"
backon = "0.4"
lazy_static = "1.4.0"

# metrics
metrics = "0.22.0"
Expand Down Expand Up @@ -499,8 +503,17 @@ serial_test = "3"
similar-asserts = "1.5.0"
test-fuzz = "5"

# raiko
anyhow = "1.0"

[patch.crates-io]
revm = { git = "https://github.com/bluealloy/revm.git", rev = "41e2f7f" }
revm-interpreter = { git = "https://github.com/bluealloy/revm.git", rev = "41e2f7f" }
revm-precompile = { git = "https://github.com/bluealloy/revm.git", rev = "41e2f7f" }
revm-primitives = { git = "https://github.com/bluealloy/revm.git", rev = "41e2f7f" }
revm = { git = "https://github.com/taikoxyz/revm.git", branch = "v36-taiko", default-features = false, features = [
"std",
"serde",
"taiko",
]}
revm-interpreter = { git = "https://github.com/taikoxyz/revm.git", branch = "v36-taiko" }
revm-precompile = { git = "https://github.com/taikoxyz/revm.git", branch = "v36-taiko" }
revm-primitives = { git = "https://github.com/taikoxyz/revm.git", branch = "v36-taiko"}
c-kzg = { git = "https://github.com/brechtpd/c-kzg-4844", branch = "for-alpha7" }
secp256k1 = { git = "https://github.com/CeciliaZ030/rust-secp256k1", branch = "sp1-patch" }
6 changes: 3 additions & 3 deletions crates/chainspec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ workspace = true
[dependencies]
# reth
reth-ethereum-forks.workspace = true
reth-network-peers.workspace = true
reth-network-peers = { workspace = true, optional = true }
reth-trie-common.workspace = true
reth-primitives-traits.workspace = true

Expand Down Expand Up @@ -49,5 +49,5 @@ std = []
arbitrary = [
"alloy-chains/arbitrary"
]


network = ["reth-network-peers"]
taiko = ["reth-ethereum-forks/taiko"]
14,473 changes: 14,472 additions & 1 deletion crates/chainspec/res/genesis/base.json

Large diffs are not rendered by default.

76 changes: 75 additions & 1 deletion crates/chainspec/res/genesis/dev.json
Original file line number Diff line number Diff line change
@@ -1 +1,75 @@
{"nonce":"0x0","timestamp":"0x6490fdd2","extraData":"0x","gasLimit":"0x1c9c380","difficulty":"0x0","mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000","coinbase":"0x0000000000000000000000000000000000000000","stateRoot":"0x5eb6e371a698b8d68f665192350ffcecbbbf322916f4b51bd79bb6887da3f494","alloc":{"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266":{"balance":"0xD3C21BCECCEDA1000000"},"0x70997970C51812dc3A010C7d01b50e0d17dc79C8":{"balance":"0xD3C21BCECCEDA1000000"},"0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC":{"balance":"0xD3C21BCECCEDA1000000"},"0x90F79bf6EB2c4f870365E785982E1f101E93b906":{"balance":"0xD3C21BCECCEDA1000000"},"0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65":{"balance":"0xD3C21BCECCEDA1000000"},"0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc":{"balance":"0xD3C21BCECCEDA1000000"},"0x976EA74026E726554dB657fA54763abd0C3a0aa9":{"balance":"0xD3C21BCECCEDA1000000"},"0x14dC79964da2C08b23698B3D3cc7Ca32193d9955":{"balance":"0xD3C21BCECCEDA1000000"},"0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f":{"balance":"0xD3C21BCECCEDA1000000"},"0xa0Ee7A142d267C1f36714E4a8F75612F20a79720":{"balance":"0xD3C21BCECCEDA1000000"},"0xBcd4042DE499D14e55001CcbB24a551F3b954096":{"balance":"0xD3C21BCECCEDA1000000"},"0x71bE63f3384f5fb98995898A86B02Fb2426c5788":{"balance":"0xD3C21BCECCEDA1000000"},"0xFABB0ac9d68B0B445fB7357272Ff202C5651694a":{"balance":"0xD3C21BCECCEDA1000000"},"0x1CBd3b2770909D4e10f157cABC84C7264073C9Ec":{"balance":"0xD3C21BCECCEDA1000000"},"0xdF3e18d64BC6A983f673Ab319CCaE4f1a57C7097":{"balance":"0xD3C21BCECCEDA1000000"},"0xcd3B766CCDd6AE721141F452C550Ca635964ce71":{"balance":"0xD3C21BCECCEDA1000000"},"0x2546BcD3c84621e976D8185a91A922aE77ECEc30":{"balance":"0xD3C21BCECCEDA1000000"},"0xbDA5747bFD65F08deb54cb465eB87D40e51B197E":{"balance":"0xD3C21BCECCEDA1000000"},"0xdD2FD4581271e230360230F9337D5c0430Bf44C0":{"balance":"0xD3C21BCECCEDA1000000"},"0x8626f6940E2eb28930eFb4CeF49B2d1F2C9C1199":{"balance":"0xD3C21BCECCEDA1000000"}},"number":"0x0","gasUsed":"0x0","parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000"}
{
"nonce": "0x0",
"timestamp": "0x6490fdd2",
"extraData": "0x",
"gasLimit": "0x1c9c380",
"difficulty": "0x0",
"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"coinbase": "0x0000000000000000000000000000000000000000",
"stateRoot": "0x5eb6e371a698b8d68f665192350ffcecbbbf322916f4b51bd79bb6887da3f494",
"alloc": {
"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0x70997970C51812dc3A010C7d01b50e0d17dc79C8": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0x90F79bf6EB2c4f870365E785982E1f101E93b906": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0x976EA74026E726554dB657fA54763abd0C3a0aa9": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0x14dC79964da2C08b23698B3D3cc7Ca32193d9955": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0xa0Ee7A142d267C1f36714E4a8F75612F20a79720": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0xBcd4042DE499D14e55001CcbB24a551F3b954096": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0x71bE63f3384f5fb98995898A86B02Fb2426c5788": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0xFABB0ac9d68B0B445fB7357272Ff202C5651694a": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0x1CBd3b2770909D4e10f157cABC84C7264073C9Ec": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0xdF3e18d64BC6A983f673Ab319CCaE4f1a57C7097": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0xcd3B766CCDd6AE721141F452C550Ca635964ce71": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0x2546BcD3c84621e976D8185a91A922aE77ECEc30": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0xbDA5747bFD65F08deb54cb465eB87D40e51B197E": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0xdD2FD4581271e230360230F9337D5c0430Bf44C0": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0x8626f6940E2eb28930eFb4CeF49B2d1F2C9C1199": {
"balance": "0xD3C21BCECCEDA1000000"
}
},
"number": "0x0",
"gasUsed": "0x0",
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
}
1,001 changes: 1,000 additions & 1 deletion crates/chainspec/res/genesis/holesky.json

Large diffs are not rendered by default.

26,695 changes: 26,694 additions & 1 deletion crates/chainspec/res/genesis/mainnet.json

Large diffs are not rendered by default.

34 changes: 33 additions & 1 deletion crates/chainspec/res/genesis/optimism.json
Original file line number Diff line number Diff line change
@@ -1 +1,33 @@
{"config":{"ChainName":"optimism-mainnet","chainId":10,"homesteadBlock":0,"eip150Block":0,"eip155Block":0,"eip158Block":0,"byzantiumBlock":0,"constantinopleBlock":0,"petersburgBlock":0,"istanbulBlock":0,"muirGlacierBlock":0,"berlinBlock":3950000,"londonBlock":105235063,"arrowGlacierBlock":105235063,"grayGlacierBlock":105235063,"mergeNetsplitBlock":105235063,"bedrockBlock":105235063,"terminalTotalDifficulty":0,"terminalTotalDifficultyPassed":true,"optimism":{"eip1559Elasticity":6,"eip1559Denominator":50},"regolithTime":0},"difficulty":"1","gasLimit":"15000000","extradata":"0x000000000000000000000000000000000000000000000000000000000000000000000398232e2064f896018496b4b44b3d62751f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","stateRoot":"0xeddb4c1786789419153a27c4c80ff44a2226b6eda04f7e22ce5bae892ea568eb","alloc":{}}
{
"config": {
"ChainName": "optimism-mainnet",
"chainId": 10,
"homesteadBlock": 0,
"eip150Block": 0,
"eip155Block": 0,
"eip158Block": 0,
"byzantiumBlock": 0,
"constantinopleBlock": 0,
"petersburgBlock": 0,
"istanbulBlock": 0,
"muirGlacierBlock": 0,
"berlinBlock": 3950000,
"londonBlock": 105235063,
"arrowGlacierBlock": 105235063,
"grayGlacierBlock": 105235063,
"mergeNetsplitBlock": 105235063,
"bedrockBlock": 105235063,
"terminalTotalDifficulty": 0,
"terminalTotalDifficultyPassed": true,
"optimism": {
"eip1559Elasticity": 6,
"eip1559Denominator": 50
},
"regolithTime": 0
},
"difficulty": "1",
"gasLimit": "15000000",
"extradata": "0x000000000000000000000000000000000000000000000000000000000000000000000398232e2064f896018496b4b44b3d62751f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"stateRoot": "0xeddb4c1786789419153a27c4c80ff44a2226b6eda04f7e22ce5bae892ea568eb",
"alloc": {}
}
61 changes: 60 additions & 1 deletion crates/chainspec/res/genesis/sepolia.json
Original file line number Diff line number Diff line change
@@ -1 +1,60 @@
{"nonce":"0x00","timestamp":"0x6159af19","extraData":"0x5365706f6c69612c20417468656e732c204174746963612c2047726565636521","gasLimit":"0x1c9c380","difficulty":"0x20000","mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000","coinbase":"0x0000000000000000000000000000000000000000","stateRoot":"0x5eb6e371a698b8d68f665192350ffcecbbbf322916f4b51bd79bb6887da3f494","alloc":{"0xa2A6d93439144FFE4D27c9E088dCD8b783946263":{"balance":"0xD3C21BCECCEDA1000000"},"0xBc11295936Aa79d594139de1B2e12629414F3BDB":{"balance":"0xD3C21BCECCEDA1000000"},"0x7cF5b79bfe291A67AB02b393E456cCc4c266F753":{"balance":"0xD3C21BCECCEDA1000000"},"0xaaec86394441f915bce3e6ab399977e9906f3b69":{"balance":"0xD3C21BCECCEDA1000000"},"0xF47CaE1CF79ca6758Bfc787dbD21E6bdBe7112B8":{"balance":"0xD3C21BCECCEDA1000000"},"0xd7eDDB78ED295B3C9629240E8924fb8D8874ddD8":{"balance":"0xD3C21BCECCEDA1000000"},"0x8b7F0977Bb4f0fBE7076FA22bC24acA043583F5e":{"balance":"0xD3C21BCECCEDA1000000"},"0xe2e2659028143784d557bcec6ff3a0721048880a":{"balance":"0xD3C21BCECCEDA1000000"},"0xd9a5179f091d85051d3c982785efd1455cec8699":{"balance":"0xD3C21BCECCEDA1000000"},"0xbeef32ca5b9a198d27B4e02F4c70439fE60356Cf":{"balance":"0xD3C21BCECCEDA1000000"},"0x0000006916a87b82333f4245046623b23794c65c":{"balance":"0x84595161401484A000000"},"0xb21c33de1fab3fa15499c62b59fe0cc3250020d1":{"balance":"0x52B7D2DCC80CD2E4000000"},"0x10F5d45854e038071485AC9e402308cF80D2d2fE":{"balance":"0x52B7D2DCC80CD2E4000000"},"0xd7d76c58b3a519e9fA6Cc4D22dC017259BC49F1E":{"balance":"0x52B7D2DCC80CD2E4000000"},"0x799D329e5f583419167cD722962485926E338F4a":{"balance":"0xDE0B6B3A7640000"}},"number":"0x0","gasUsed":"0x0","parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000"}
{
"nonce": "0x00",
"timestamp": "0x6159af19",
"extraData": "0x5365706f6c69612c20417468656e732c204174746963612c2047726565636521",
"gasLimit": "0x1c9c380",
"difficulty": "0x20000",
"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"coinbase": "0x0000000000000000000000000000000000000000",
"stateRoot": "0x5eb6e371a698b8d68f665192350ffcecbbbf322916f4b51bd79bb6887da3f494",
"alloc": {
"0xa2A6d93439144FFE4D27c9E088dCD8b783946263": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0xBc11295936Aa79d594139de1B2e12629414F3BDB": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0x7cF5b79bfe291A67AB02b393E456cCc4c266F753": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0xaaec86394441f915bce3e6ab399977e9906f3b69": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0xF47CaE1CF79ca6758Bfc787dbD21E6bdBe7112B8": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0xd7eDDB78ED295B3C9629240E8924fb8D8874ddD8": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0x8b7F0977Bb4f0fBE7076FA22bC24acA043583F5e": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0xe2e2659028143784d557bcec6ff3a0721048880a": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0xd9a5179f091d85051d3c982785efd1455cec8699": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0xbeef32ca5b9a198d27B4e02F4c70439fE60356Cf": {
"balance": "0xD3C21BCECCEDA1000000"
},
"0x0000006916a87b82333f4245046623b23794c65c": {
"balance": "0x84595161401484A000000"
},
"0xb21c33de1fab3fa15499c62b59fe0cc3250020d1": {
"balance": "0x52B7D2DCC80CD2E4000000"
},
"0x10F5d45854e038071485AC9e402308cF80D2d2fE": {
"balance": "0x52B7D2DCC80CD2E4000000"
},
"0xd7d76c58b3a519e9fA6Cc4D22dC017259BC49F1E": {
"balance": "0x52B7D2DCC80CD2E4000000"
},
"0x799D329e5f583419167cD722962485926E338F4a": {
"balance": "0xDE0B6B3A7640000"
}
},
"number": "0x0",
"gasUsed": "0x0",
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
}
15,257 changes: 15,256 additions & 1 deletion crates/chainspec/res/genesis/sepolia_base.json

Large diffs are not rendered by default.

14,463 changes: 14,462 additions & 1 deletion crates/chainspec/res/genesis/sepolia_op.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion crates/chainspec/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ pub use alloy_chains::{Chain, ChainKind, NamedChain};
pub use info::ChainInfo;
pub use spec::{
AllGenesisFormats, BaseFeeParams, BaseFeeParamsKind, ChainSpec, ChainSpecBuilder,
DepositContract, ForkBaseFeeParams, DEV, GOERLI, HOLESKY, MAINNET, SEPOLIA,
DepositContract, ForkBaseFeeParams, DEV, GOERLI, HOLESKY, MAINNET, SEPOLIA, TAIKO_A7,
TAIKO_DEV, TAIKO_MAINNET,
};
#[cfg(feature = "optimism")]
pub use spec::{BASE_MAINNET, BASE_SEPOLIA, OP_MAINNET, OP_SEPOLIA};
Expand All @@ -22,6 +23,7 @@ pub use spec::{BASE_MAINNET, BASE_SEPOLIA, OP_MAINNET, OP_SEPOLIA};
/// The chain info module.
mod info;

#[cfg(feature = "network")]
/// Network related constants
pub mod net;

Expand Down
Loading
Loading