From 8a22131d011dff7940938efb7669a308052d50b4 Mon Sep 17 00:00:00 2001 From: evalir Date: Tue, 15 Jul 2025 08:26:12 -0400 Subject: [PATCH] chore(deps): bump sdk & related deps Fixes are mostly conversions to/from U256. --- Cargo.lock | 257 ++++++++++++++++++++++++---------------- Cargo.toml | 16 +-- src/tasks/block/sim.rs | 7 +- src/tasks/cache/task.rs | 4 +- src/tasks/env.rs | 10 +- src/test_utils.rs | 4 +- 6 files changed, 175 insertions(+), 123 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 48b10d0..6f70f06 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -46,9 +46,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy" -version = "1.0.11" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e746cb4cea9ab4cda8cb117717b16c21116004f51efd78968ee0f1ffcf2602" +checksum = "ae58d888221eecf621595e2096836ce7cfc37be06bfa39d7f64aa6a3ea4c9e5b" dependencies = [ "alloy-consensus", "alloy-contract", @@ -103,7 +103,7 @@ dependencies = [ "k256", "once_cell", "rand 0.8.5", - "secp256k1", + "secp256k1 0.30.0", "serde", "serde_with", "thiserror 2.0.12", @@ -1778,6 +1778,12 @@ dependencies = [ "tracing", ] +[[package]] +name = "az" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" + [[package]] name = "backtrace" version = "0.3.75" @@ -1958,11 +1964,11 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "signet-constants 0.5.0", + "signet-constants 0.7.0", "signet-sim", - "signet-tx-cache 0.5.0", - "signet-types 0.5.0", - "signet-zenith 0.5.0", + "signet-tx-cache 0.7.0", + "signet-types 0.7.0", + "signet-zenith 0.7.0", "tokio", "tokio-stream", "tracing", @@ -2755,6 +2761,16 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +[[package]] +name = "gmp-mpfr-sys" +version = "1.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c66d61197a68f6323b9afa616cf83d55d69191e1bf364d4eb7d35ae18defe776" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + [[package]] name = "group" version = "0.13.0" @@ -3266,9 +3282,9 @@ dependencies = [ [[package]] name = "init4-bin-base" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd40a042a02db58529e28c17b4da70c0d48553fae93a6a8268acf49ece9c5a99" +checksum = "54205e79c4a080b23306b5751ea2ab57d79a1df89b08384e7b9530160077410e" dependencies = [ "alloy", "async-trait", @@ -3287,8 +3303,8 @@ dependencies = [ "opentelemetry_sdk", "reqwest 0.12.20", "serde", - "signet-constants 0.4.2", - "signet-tx-cache 0.4.2", + "signet-constants 0.6.0", + "signet-tx-cache 0.6.0", "thiserror 2.0.12", "tokio", "tower", @@ -4735,9 +4751,9 @@ dependencies = [ [[package]] name = "revm" -version = "23.1.0" +version = "27.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df1eb83c8652836bc0422f9a144522179134d8befcc7ab595c1ada60dac39e51" +checksum = "24188978ab59b8fd508d0193f8a08848bdcd19ae0f73f2ad1d6ee3b2cd6c0903" dependencies = [ "revm-bytecode", "revm-context", @@ -4754,9 +4770,9 @@ dependencies = [ [[package]] name = "revm-bytecode" -version = "4.1.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942fe4724cf552fd28db6b0a2ca5b79e884d40dd8288a4027ed1e9090e0c6f49" +checksum = "7a685758a4f375ae9392b571014b9779cfa63f0d8eb91afb4626ddd958b23615" dependencies = [ "bitvec", "once_cell", @@ -4767,9 +4783,9 @@ dependencies = [ [[package]] name = "revm-context" -version = "4.1.0" +version = "8.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcd6faa992a1a10b84723326d6117203764c040d3519fd1ba34950d049389eb7" +checksum = "2c949e6b9d996ae5c7606cd4f82d997dabad30909f85601b5876b704d95b505b" dependencies = [ "cfg-if", "derive-where", @@ -4783,9 +4799,9 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "4.1.0" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2b42cac141cd388c38db420d3d18e7b23013c5747d5ed648d2d9a225263d51" +checksum = "a303a93102fceccec628265efd550ce49f2817b38ac3a492c53f7d524f18a1ca" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -4799,9 +4815,9 @@ dependencies = [ [[package]] name = "revm-database" -version = "4.0.1" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad3fbe34f6bb00a9c3155723b3718b9cb9f17066ba38f9eb101b678cd3626775" +checksum = "7db360729b61cc347f9c2f12adb9b5e14413aea58778cf9a3b7676c6a4afa115" dependencies = [ "alloy-eips", "alloy-provider", @@ -4816,11 +4832,12 @@ dependencies = [ [[package]] name = "revm-database-interface" -version = "4.0.1" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b8acd36784a6d95d5b9e1b7be3ce014f1e759abb59df1fa08396b30f71adc2a" +checksum = "b8500194cad0b9b1f0567d72370795fd1a5e0de9ec719b1607fa1566a23f039a" dependencies = [ "auto_impl", + "either", "revm-primitives", "revm-state", "serde", @@ -4829,11 +4846,12 @@ dependencies = [ [[package]] name = "revm-handler" -version = "4.1.0" +version = "8.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511e50a8c7f14e97681ec96266ee53bf8316c0dea1d4a6633ff6f37c5c0fe9d0" +checksum = "35b3a613d012189571b28fb13befc8c8af54e54f4f76997a0c02828cea0584a3" dependencies = [ "auto_impl", + "derive-where", "revm-bytecode", "revm-context", "revm-context-interface", @@ -4847,11 +4865,12 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "4.1.0" +version = "8.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f6c88fcf481f8e315bfd87377aa0ae83e1159dd381430122cbf431474ce39c" +checksum = "64aee1f5f5b07cfa73250f530edf4c8c3bb8da693d5d00fe9f94f70499978f00" dependencies = [ "auto_impl", + "either", "revm-context", "revm-database-interface", "revm-handler", @@ -4864,9 +4883,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "19.1.0" +version = "23.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b7d75106333808bc97df3cd6a1864ced4ffec9be28fd3e459733813f3c300e" +checksum = "8d2a89c40b7c72220f3d4b753ca0ce9ae912cf5dad7d3517182e4e1473b9b55e" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -4876,15 +4895,16 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "20.1.0" +version = "24.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06769068a34fd237c74193118530af3912e1b16922137a96fc302f29c119966" +checksum = "5c35a987086055a5cb368e080d1300ea853a3185b7bb9cdfebb8c05852cda24f" dependencies = [ "ark-bls12-381", "ark-bn254", "ark-ec", "ark-ff 0.5.0", "ark-serialize 0.5.0", + "arrayref", "aurora-engine-modexp", "blst", "c-kzg", @@ -4895,15 +4915,16 @@ dependencies = [ "p256", "revm-primitives", "ripemd", - "secp256k1", + "rug", + "secp256k1 0.31.1", "sha2 0.10.9", ] [[package]] name = "revm-primitives" -version = "19.2.0" +version = "20.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c1588093530ec4442461163be49c433c07a3235d1ca6f6799fef338dacc50d3" +checksum = "52cdf897b3418f2ee05bcade64985e5faed2dbaa349b2b5f27d3d6bfd10fff2a" dependencies = [ "alloy-primitives", "num_enum", @@ -4912,9 +4933,9 @@ dependencies = [ [[package]] name = "revm-state" -version = "4.0.1" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0040c61c30319254b34507383ba33d85f92949933adf6525a2cede05d165e1fa" +checksum = "106fec5c634420118c7d07a6c37110186ae7f23025ceac3a5dbe182eea548363" dependencies = [ "bitflags 2.9.1", "revm-bytecode", @@ -4965,6 +4986,18 @@ dependencies = [ "rustc-hex", ] +[[package]] +name = "rug" +version = "1.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4207e8d668e5b8eb574bda8322088ccd0d7782d3d03c7e8d562e82ed82bdcbc3" +dependencies = [ + "az", + "gmp-mpfr-sys", + "libc", + "libm", +] + [[package]] name = "ruint" version = "1.15.0" @@ -5243,10 +5276,21 @@ checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" dependencies = [ "bitcoin_hashes", "rand 0.8.5", - "secp256k1-sys", + "secp256k1-sys 0.10.1", "serde", ] +[[package]] +name = "secp256k1" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2" +dependencies = [ + "bitcoin_hashes", + "rand 0.9.1", + "secp256k1-sys 0.11.0", +] + [[package]] name = "secp256k1-sys" version = "0.10.1" @@ -5256,6 +5300,15 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb913707158fadaf0d8702c2db0e857de66eb003ccfdda5924b5f5ac98efb38" +dependencies = [ + "cc", +] + [[package]] name = "security-framework" version = "2.11.1" @@ -5509,15 +5562,15 @@ dependencies = [ [[package]] name = "signet-bundle" -version = "0.4.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7111906d6900c3520a03d7d33be4ff041617ccc7fda9fd14d3a80d7eb1ccfe7" +checksum = "e30be4c1c86712ee1c0c600d00e02ff474f89fa400d765ca966c195e846d6565" dependencies = [ "alloy", "serde", - "signet-evm 0.4.2", - "signet-types 0.4.2", - "signet-zenith 0.4.2", + "signet-evm 0.6.0", + "signet-types 0.6.0", + "signet-zenith 0.6.0", "thiserror 2.0.12", "tracing", "trevm", @@ -5525,15 +5578,15 @@ dependencies = [ [[package]] name = "signet-bundle" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ada7478b21e4f1254c9f178e175a5826721dc633fc0b8ef159db609fe1d3" +checksum = "6094d76ab845ab39a23bc4b9e560bb65b942210013e6f511d6f6b24c63e74e68" dependencies = [ "alloy", "serde", - "signet-evm 0.5.0", - "signet-types 0.5.0", - "signet-zenith 0.5.0", + "signet-evm 0.7.0", + "signet-types 0.7.0", + "signet-zenith 0.7.0", "thiserror 2.0.12", "tracing", "trevm", @@ -5541,14 +5594,11 @@ dependencies = [ [[package]] name = "signet-constants" -version = "0.4.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c162ca6e5e344a39ab37fb5768b42824eed9c825242b56a84d5af6faf39677" +checksum = "c5e0ce3e6caadd3b6c783575199c009fab912beed8183435ec38913fe1ad51ce" dependencies = [ "alloy", - "alloy-consensus", - "alloy-genesis", - "alloy-trie", "serde", "serde_json", "thiserror 2.0.12", @@ -5556,14 +5606,11 @@ dependencies = [ [[package]] name = "signet-constants" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b3bc73ec5925576ad9df3cfc696e3fb7f90ae3cab9467b1bca62436b8fc4d23" +checksum = "164c9228a89b5438e468386a9d586868f4fede4fee6e2ebbf4697fff2c088afe" dependencies = [ "alloy", - "alloy-consensus", - "alloy-genesis", - "alloy-trie", "serde", "serde_json", "thiserror 2.0.12", @@ -5571,14 +5618,14 @@ dependencies = [ [[package]] name = "signet-evm" -version = "0.4.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c68bd0f98b75e6b3d2f816ca7d28eb3243941dc94783f78f8ed9f3a775f7378" +checksum = "d73a0596456adf55841ee24d263be622661ec76e50338660c4d407a72176dbd5" dependencies = [ "alloy", - "signet-extract 0.4.2", - "signet-types 0.4.2", - "signet-zenith 0.4.2", + "signet-extract 0.6.0", + "signet-types 0.6.0", + "signet-zenith 0.6.0", "thiserror 2.0.12", "tracing", "trevm", @@ -5586,14 +5633,14 @@ dependencies = [ [[package]] name = "signet-evm" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d565caf0817d41db3ca4ce1e512fb92b815b576c5c827a3fff342c3817a65c" +checksum = "41abc521a9639574b10c03b75ede0f38ca68417b471dbcdfcd6fc74a709fb2b7" dependencies = [ "alloy", - "signet-extract 0.5.0", - "signet-types 0.5.0", - "signet-zenith 0.5.0", + "signet-extract 0.7.0", + "signet-types 0.7.0", + "signet-zenith 0.7.0", "thiserror 2.0.12", "tracing", "trevm", @@ -5601,40 +5648,40 @@ dependencies = [ [[package]] name = "signet-extract" -version = "0.4.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2557034003e282781bd8df42920b8e0ee382234f83d065609b8fc7897ec4e586" +checksum = "b85c8d178770c5f61d6db742498ac261ae4952c3765513c34a17e8cf7a13c157" dependencies = [ "alloy", - "signet-types 0.4.2", - "signet-zenith 0.4.2", + "signet-types 0.6.0", + "signet-zenith 0.6.0", "tracing", ] [[package]] name = "signet-extract" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9871cd963a10d712413d1cbd01928739d34e9e4c6ad04b296f5893781799b6db" +checksum = "5c294dc796169efdbdcb4dee1a41fdc9d4ecdfd404d618d3f7949c133e62e56d" dependencies = [ "alloy", - "signet-types 0.5.0", - "signet-zenith 0.5.0", + "signet-types 0.7.0", + "signet-zenith 0.7.0", "tracing", ] [[package]] name = "signet-sim" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d984ec549f2b9e96852cbade6489c9de986787bd6455c01e823010b6e95d45c" +checksum = "c7ab234924e60e85a874eb8d47e3fd7ea5f811cc62d9580c99d925ef55346347" dependencies = [ "alloy", "parking_lot", - "signet-bundle 0.5.0", - "signet-evm 0.5.0", - "signet-types 0.5.0", - "signet-zenith 0.5.0", + "signet-bundle 0.7.0", + "signet-evm 0.7.0", + "signet-types 0.7.0", + "signet-zenith 0.7.0", "thiserror 2.0.12", "tokio", "tracing", @@ -5643,71 +5690,71 @@ dependencies = [ [[package]] name = "signet-tx-cache" -version = "0.4.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c9eaf436cec65fcec2b236212c04a1046242c219c04fab29c03d595103fa96f" +checksum = "99dc7dbdfe32eba40ddef7662cc6dbf271f2a364b97132eb27fc25e06c7c3e3d" dependencies = [ "alloy", "eyre", "reqwest 0.12.20", "serde", - "signet-bundle 0.4.2", - "signet-constants 0.4.2", - "signet-types 0.4.2", + "signet-bundle 0.6.0", + "signet-constants 0.6.0", + "signet-types 0.6.0", "tracing", "uuid", ] [[package]] name = "signet-tx-cache" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffd349a824af610d0591c38aaa6b11f6a634d3498276a776ca157e3f2b304d9" +checksum = "ef601f7e9a0269f2a4410ecdbba50f04328f0766d11bfe1c8ea12ce2fd018b5b" dependencies = [ "alloy", "eyre", "reqwest 0.12.20", "serde", - "signet-bundle 0.5.0", - "signet-constants 0.5.0", - "signet-types 0.5.0", + "signet-bundle 0.7.0", + "signet-constants 0.7.0", + "signet-types 0.7.0", "tracing", "uuid", ] [[package]] name = "signet-types" -version = "0.4.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24cbf456d30d3bcbfa6f3c4535c67ba3f508170aa3914cc828dc1cb188d24b84" +checksum = "e7fc9cf3f454aec0b4ac444db789fe974dfecfd6187fd546e35c96e713f10cd7" dependencies = [ "alloy", "chrono", "serde", - "signet-constants 0.4.2", - "signet-zenith 0.4.2", + "signet-constants 0.6.0", + "signet-zenith 0.6.0", "thiserror 2.0.12", ] [[package]] name = "signet-types" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22b804bce163bcef58f74986972a8d512e16005d362698427abb20c4f9c20f2" +checksum = "a339366be6c2022fb3e22cbb3ddccaee5bc5931ac57de84c03735f844dc20036" dependencies = [ "alloy", "chrono", "serde", - "signet-constants 0.5.0", - "signet-zenith 0.5.0", + "signet-constants 0.7.0", + "signet-zenith 0.7.0", "thiserror 2.0.12", ] [[package]] name = "signet-zenith" -version = "0.4.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bbce77ff1134563106c1dc4ff7600ce752901592c136a7eb2b4d151156a0674" +checksum = "6be2d9614fbb9651c310c5d4d0860b76c9ee315d9091d9a9d57310d3820f5641" dependencies = [ "alloy", "serde", @@ -5716,9 +5763,9 @@ dependencies = [ [[package]] name = "signet-zenith" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7800fcf9bc71896eb8fdc3cd5827c72c8ed03958cce3e1a2539b30f04b1e5d" +checksum = "4f9cbb63291567402580b5a4de4dec61af9b75907c3575c3ac528edccb0f8436" dependencies = [ "alloy", "serde", @@ -6363,9 +6410,9 @@ dependencies = [ [[package]] name = "trevm" -version = "0.23.8" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90a3468526554414c6ca49950c9e819447c95e848d6a62f96ce1db4dda1bc15f" +checksum = "8398be4100d211dfb673f0464f1b0315bad13dfb1ac6547b51c182f4dad67cbc" dependencies = [ "alloy", "dashmap", diff --git a/Cargo.toml b/Cargo.toml index 870d275..5c47daa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,17 +25,17 @@ path = "bin/submit_transaction.rs" integration = [] [dependencies] -init4-bin-base = { version = "0.6.0", features = ["perms"] } +init4-bin-base = { version = "0.7.1", features = ["perms"] } -signet-constants = { version = "0.5.0" } -signet-sim = { version = "0.5.0" } -signet-tx-cache = { version = "0.5.0" } -signet-types = { version = "0.5.0" } -signet-zenith = { version = "0.5.0" } +signet-constants = { version = "0.7.0" } +signet-sim = { version = "0.7.0" } +signet-tx-cache = { version = "0.7.0" } +signet-types = { version = "0.7.0" } +signet-zenith = { version = "0.7.0" } -trevm = { version = "0.23.6", features = ["concurrent-db", "test-utils"] } +trevm = { version = "0.27.0", features = ["concurrent-db", "test-utils"] } -alloy = { version = "1.0.11", features = [ +alloy = { version = "1.0.19", features = [ "full", "json-rpc", "signer-aws", diff --git a/src/tasks/block/sim.rs b/src/tasks/block/sim.rs index c1fb8b4..1c2328a 100644 --- a/src/tasks/block/sim.rs +++ b/src/tasks/block/sim.rs @@ -93,7 +93,7 @@ impl Simulator { /// /// A `Result` containing the built block or an error. #[instrument(skip_all, fields( - block_number = block_env.number, + block_number = block_env.number.to::(), tx_count = sim_items.len(), millis_to_deadline = finish_by.duration_since(Instant::now()).as_millis() ))] @@ -107,7 +107,7 @@ impl Simulator { let concurrency_limit = self.config.concurrency_limit(); // NB: Build AlloyDB from the previous block number's state, since block_env maps to the in-progress block - let db = self.create_db(block_env.number - 1).unwrap(); + let db = self.create_db(block_env.number.to::() - 1).unwrap(); let block_build: BlockBuild<_, NoOpInspector> = BlockBuild::new( db, @@ -182,7 +182,8 @@ impl Simulator { return; } let Some(sim_env) = self.sim_env.borrow_and_update().clone() else { return }; - info!(sim_env.block_env.number, "new block environment received"); + let block_number = sim_env.block_env.number.to::(); + info!(block_number, "new block environment received"); // Calculate the deadline for this block simulation. // NB: This must happen _after_ taking a reference to the sim cache, diff --git a/src/tasks/cache/task.rs b/src/tasks/cache/task.rs index 14f55b5..6d0b63d 100644 --- a/src/tasks/cache/task.rs +++ b/src/tasks/cache/task.rs @@ -45,9 +45,9 @@ impl CacheTask { } if let Some(env) = self.env.borrow_and_update().as_ref() { basefee = env.block_env.basefee; - info!(basefee, env.block_env.number, env.block_env.timestamp, "rollup block env changed, clearing cache"); + info!(basefee, block_env_number = env.block_env.number.to::(), block_env_timestamp = env.block_env.timestamp.to::(), "rollup block env changed, clearing cache"); cache.clean( - env.block_env.number, env.block_env.timestamp + env.block_env.number.to(), env.block_env.timestamp.to() ); } } diff --git a/src/tasks/env.rs b/src/tasks/env.rs index 7ec8ad9..e98f523 100644 --- a/src/tasks/env.rs +++ b/src/tasks/env.rs @@ -38,10 +38,10 @@ impl EnvTask { /// Construct a [`BlockEnv`] by from the previous block header. fn construct_block_env(&self, previous: &Header) -> BlockEnv { BlockEnv { - number: previous.number + 1, + number: U256::from(previous.number + 1), beneficiary: self.config.builder_rewards_address, // NB: EXACTLY the same as the previous block - timestamp: previous.number + self.config.slot_calculator.slot_duration(), + timestamp: U256::from(previous.number + self.config.slot_calculator.slot_duration()), gas_limit: self.config.rollup_block_gas_limit, basefee: previous .next_block_base_fee(BaseFeeParams::ethereum()) @@ -99,7 +99,11 @@ impl EnvTask { // Construct the block env using the previous block header let signet_env = self.construct_block_env(&rollup_header); - debug!(signet_env.number, signet_env.basefee, "constructed signet block env"); + debug!( + signet_env_number = signet_env.number.to::(), + signet_env_basefee = signet_env.basefee, + "constructed signet block env" + ); if sender .send(Some(SimEnv { block_env: signet_env, prev_header: rollup_header })) diff --git a/src/test_utils.rs b/src/test_utils.rs index 3d74ed4..0ad99d2 100644 --- a/src/test_utils.rs +++ b/src/test_utils.rs @@ -88,9 +88,9 @@ pub fn test_block_env( timestamp: u64, ) -> BlockEnv { BlockEnv { - number, + number: U256::from(number), beneficiary: Address::repeat_byte(1), - timestamp, + timestamp: U256::from(timestamp), gas_limit: config.rollup_block_gas_limit, basefee, difficulty: U256::ZERO,