From f81ac4ce23e06470b62c6bd3ac7cd8c44687f1ef Mon Sep 17 00:00:00 2001 From: refcell Date: Wed, 29 Jan 2025 19:11:27 -0500 Subject: [PATCH] maili updates --- Cargo.lock | 84 ++++++++++++----------------- Cargo.toml | 8 +-- crates/executor/Cargo.toml | 2 +- crates/executor/src/executor/env.rs | 27 +--------- crates/executor/src/executor/mod.rs | 2 +- 5 files changed, 42 insertions(+), 81 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02a912ec0..cf329f106 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -518,7 +518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74e60b084fe1aef8acecda2743ff2d93c18ff3eb67a2d3b12f62582a1e66ef5e" dependencies = [ "serde", - "winnow", + "winnow 0.6.26", ] [[package]] @@ -1291,26 +1291,6 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "const_format" -version = "0.2.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" -dependencies = [ - "const_format_proc_macros", -] - -[[package]] -name = "const_format_proc_macros" -version = "0.2.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - [[package]] name = "core-foundation" version = "0.9.4" @@ -2914,15 +2894,16 @@ dependencies = [ [[package]] name = "maili-genesis" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e791646cff844a9530d447b6a029f4195bcaaf6af67196a7d5a67ab3ee8e60ff" +checksum = "768927c57b7b345e05f11762bec4c0338dea99dba1f3954a9d762998e9fc8c5f" dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", "alloy-sol-types", "maili-serde", + "revm", "serde", "serde_repr", "thiserror 2.0.11", @@ -2930,9 +2911,9 @@ dependencies = [ [[package]] name = "maili-protocol" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4e18204263b87cda449d7d7d41264997659bdd08188cdae588f94b190ad0f2" +checksum = "91207581f38f02ed815f23bcb8457b1d0b9506212139cf54f4b35e89cac9560f" dependencies = [ "alloc-no-stdlib", "alloy-consensus", @@ -2958,9 +2939,9 @@ dependencies = [ [[package]] name = "maili-registry" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "383dc2929f86aa100a49dc437eaa1dcd4d79ebdbcb810e3c5459d546b7583dea" +checksum = "01189e3ca0c4c04f3a1228af969350b0501ae1dd052dec3538939399d1f412be" dependencies = [ "alloy-primitives", "lazy_static", @@ -2973,24 +2954,22 @@ dependencies = [ [[package]] name = "maili-rpc" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1dfa4a28f0a0b0a6685fda82150d4a39a36542025ba2e8f24c1b1564b722ae3" +checksum = "2c508f63e1d0fd1e5c51cda4cedaf8a73ec4ab4fb3fbc4815d9d6033a90c9662" dependencies = [ "alloy-eips", "alloy-primitives", - "alloy-sol-types", "derive_more", "maili-protocol", "op-alloy-rpc-types-engine", - "thiserror 2.0.11", ] [[package]] name = "maili-serde" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "665f29e5b609a7823e6529c066e0ccccfa867b3b7f8cdc6bbeb1cc70681eae66" +checksum = "9d1de634cf1a237843cab05c84f5fcbc95106ce7754b5e66c4b5a43f2c0aef13" dependencies = [ "alloy-primitives", "serde", @@ -2999,9 +2978,9 @@ dependencies = [ [[package]] name = "maili-superchain" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4924ed5a7f24980cea22d303103aff3a24a39faa46e07acec31c0edf0e73e5" +checksum = "c15aed5565dc34a47dc82d6cf624c5cf8e129e7c821e56e14f31d7a1ae48470d" dependencies = [ "alloy-primitives", "maili-genesis", @@ -3375,30 +3354,28 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.7.2" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91c2d9a6a6004e205b7e881856fb1a0f5022d382acc2c01b52185f7b6f65997" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec", "bitvec", "byte-slice-cast", - "const_format", "impl-trait-for-tuples", "parity-scale-codec-derive", - "rustversion", "serde", ] [[package]] name = "parity-scale-codec-derive" -version = "3.7.2" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77555fd9d578b6470470463fded832619a5fec5ad6cbc551fe4d7507ce50cd3a" +checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.96", + "syn 1.0.109", ] [[package]] @@ -4198,9 +4175,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.21" +version = "0.23.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" +checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7" dependencies = [ "once_cell", "ring", @@ -5030,15 +5007,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.7.0", ] [[package]] @@ -5563,9 +5540,18 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.25" +version = "0.6.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e90edd2ac1aa278a5c4599b1d89cf03074b610800f866d4026dc199d7929a28" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad699df48212c6cc6eb4435f35500ac6fd3b9913324f938aea302022ce19d310" +checksum = "7e49d2d35d3fad69b39b94139037ecfb4f359f08958b9c11e7315ce770462419" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 2ea1396f1..a21e7621f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -79,10 +79,10 @@ kona-preimage = { path = "crates/proof-sdk/preimage", version = "0.2.1", default kona-std-fpvm-proc = { path = "crates/proof-sdk/std-fpvm-proc", version = "0.1.2", default-features = false } # Maili -maili-rpc = { version = "0.1.9", default-features = false } -maili-protocol = { version = "0.1.9", default-features = false } -maili-registry = { version = "0.1.9", default-features = false } -maili-genesis = { version = "0.1.9", default-features = false } +maili-rpc = { version = "0.1.11", default-features = false } +maili-protocol = { version = "0.1.11", default-features = false } +maili-registry = { version = "0.1.11", default-features = false } +maili-genesis = { version = "0.1.11", default-features = false } # Alloy alloy-rlp = { version = "0.3.11", default-features = false } diff --git a/crates/executor/Cargo.toml b/crates/executor/Cargo.toml index fd4e5103b..0d3788d32 100644 --- a/crates/executor/Cargo.toml +++ b/crates/executor/Cargo.toml @@ -16,7 +16,7 @@ workspace = true kona-mpt.workspace = true # Maili -maili-genesis.workspace = true +maili-genesis = { workspace = true, features = ["revm"] } # Alloy alloy-consensus = { workspace = true, features = ["k256"] } diff --git a/crates/executor/src/executor/env.rs b/crates/executor/src/executor/env.rs index f334d4319..33a792db6 100644 --- a/crates/executor/src/executor/env.rs +++ b/crates/executor/src/executor/env.rs @@ -19,31 +19,6 @@ where P: TrieDBProvider, H: TrieHinter, { - /// Returns the active [SpecId] for the executor. - /// - /// ## Takes - /// - `timestamp`: The timestamp of the executing block. - /// - /// ## Returns - /// The active [SpecId] for the executor. - pub(crate) fn revm_spec_id(&self, timestamp: u64) -> SpecId { - if self.config.is_isthmus_active(timestamp) { - SpecId::ISTHMUS - } else if self.config.is_holocene_active(timestamp) { - SpecId::HOLOCENE - } else if self.config.is_fjord_active(timestamp) { - SpecId::FJORD - } else if self.config.is_ecotone_active(timestamp) { - SpecId::ECOTONE - } else if self.config.is_canyon_active(timestamp) { - SpecId::CANYON - } else if self.config.is_regolith_active(timestamp) { - SpecId::REGOLITH - } else { - SpecId::BEDROCK - } - } - /// Returns the active [CfgEnvWithHandlerCfg] for the executor. /// /// ## Takes @@ -54,7 +29,7 @@ where pub(crate) fn evm_cfg_env(&self, timestamp: u64) -> CfgEnvWithHandlerCfg { let cfg_env = CfgEnv::default().with_chain_id(self.config.l2_chain_id); let mut cfg_handler_env = - CfgEnvWithHandlerCfg::new_with_spec_id(cfg_env, self.revm_spec_id(timestamp)); + CfgEnvWithHandlerCfg::new_with_spec_id(cfg_env, self.config.spec_id(timestamp)); cfg_handler_env.enable_optimism(); cfg_handler_env } diff --git a/crates/executor/src/executor/mod.rs b/crates/executor/src/executor/mod.rs index c58f5b660..64961b3e8 100644 --- a/crates/executor/src/executor/mod.rs +++ b/crates/executor/src/executor/mod.rs @@ -118,7 +118,7 @@ where &payload, )?; let initialized_block_env = Self::prepare_block_env( - self.revm_spec_id(payload.payload_attributes.timestamp), + self.config.spec_id(payload.payload_attributes.timestamp), self.trie_db.parent_block_header(), &payload, &base_fee_params,