From 65718e86ddc86a1479506ee346a1117bcce98ba3 Mon Sep 17 00:00:00 2001 From: evalir Date: Wed, 10 Sep 2025 12:10:16 -0400 Subject: [PATCH 1/2] feat(config): Set `SlotCalculator` config with `CHAIN_NAME` instead of verbose values This makes it easier to configure the builder through setting the chain name, instead of setting each calculator configuration variable. Closes ENG-1372 --- Cargo.lock | 267 +++++++++++++++++++++++++++++++++----------------- Cargo.toml | 16 +-- README.md | 6 +- src/config.rs | 1 + 4 files changed, 187 insertions(+), 103 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bad3295e..c52ebb7e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -46,9 +46,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48dff4dd98e17de00203f851800bbc8b76eb29a4d4e3e44074614338b7a3308d" +checksum = "2e2a5d689ccd182f1d138a61f081841b905034e0089f5278f6c200f2bcdab00a" dependencies = [ "alloy-consensus", "alloy-contract", @@ -70,6 +70,7 @@ dependencies = [ "alloy-transport-http", "alloy-transport-ipc", "alloy-transport-ws", + "alloy-trie", ] [[package]] @@ -85,9 +86,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda689f7287f15bd3582daba6be8d1545bad3740fd1fb778f629a1fe866bb43b" +checksum = "d213580c17d239ae83c0d897ac3315db7cda83d2d4936a9823cc3517552f2e24" dependencies = [ "alloy-eips", "alloy-primitives", @@ -111,9 +112,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5659581e41e8fe350ecc3593cb5c9dcffddfd550896390f2b78a07af67b0fa" +checksum = "81443e3b8dccfeac7cd511aced15928c97ff253f4177acbb97de97178e543f6c" dependencies = [ "alloy-consensus", "alloy-eips", @@ -126,9 +127,9 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "944085cf3ac8f32d96299aa26c03db7c8ca6cdaafdbc467910b889f0328e6b70" +checksum = "de217ab604f1bcfa2e3b0aff86d50812d5931d47522f9f0a949cc263ec2d108e" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -224,9 +225,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f35887da30b5fc50267109a3c61cd63e6ca1f45967983641053a40ee83468c1" +checksum = "2a15b4b0f6bab47aae017d52bb5a739bda381553c09fb9918b7172721ef5f5de" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -240,14 +241,16 @@ dependencies = [ "derive_more", "either", "serde", + "serde_with", "sha2 0.10.9", + "thiserror 2.0.12", ] [[package]] name = "alloy-genesis" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d4009efea6f403b3a80531f9c6f70fc242399498ff71196a1688cc1c901f44" +checksum = "33ba1cbc25a07e0142e8875fcbe80e1fdb02be8160ae186b90f4b9a69a72ed2b" dependencies = [ "alloy-eips", "alloy-primitives", @@ -284,9 +287,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "883dee3b4020fcb5667ee627b4f401e899dad82bf37b246620339dd980720ed9" +checksum = "f8882ec8e4542cfd02aadc6dccbe90caa73038f60016d936734eb6ced53d2167" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -299,9 +302,9 @@ dependencies = [ [[package]] name = "alloy-network" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd6e5b8ac1654a05c224390008e43634a2bdc74e181e02cf8ed591d8b3d4ad08" +checksum = "51d6d87d588bda509881a7a66ae77c86514bd1193ac30fbff0e0f24db95eb5a5" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -325,9 +328,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7980333dd9391719756ac28bc2afa9baa705fc70ffd11dc86ab078dd64477" +checksum = "5b14fa9ba5774e0b30ae6a04176d998211d516c8af69c9c530af7c6c42a8c508" dependencies = [ "alloy-consensus", "alloy-eips", @@ -338,9 +341,9 @@ dependencies = [ [[package]] name = "alloy-node-bindings" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "984c20af8aee7d123bb4bf40cf758b362b38cb9ff7160d986b6face604a1e6a9" +checksum = "9d82efad69266f38e1ef3c6fbfe2f86fa7aec3cf4726368a64914ff5f7a37a0d" dependencies = [ "alloy-genesis", "alloy-hardforks", @@ -390,9 +393,9 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478a42fe167057b7b919cd8b0c2844f0247f667473340dad100eaf969de5754e" +checksum = "475a5141313c3665b75d818be97d5fa3eb5e0abb7e832e9767edd94746db28e3" dependencies = [ "alloy-chains", "alloy-consensus", @@ -437,9 +440,9 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a99b17987f40a066b29b6b56d75e84cd193b866cac27cae17b59f40338de95" +checksum = "f97c18795ce1ce8151c5539ce1e4200940389674173f677c7455f79bfb00e5df" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -481,9 +484,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0c6d723fbdf4a87454e2e3a275e161be27edcfbf46e2e3255dd66c138634b6" +checksum = "25289674cd8c58fcca2568b5350423cb0dd7bca8c596c5e2869bfe4c5c57ed14" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -507,9 +510,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41492dac39365b86a954de86c47ec23dcc7452cdb2fde591caadc194b3e34c6" +checksum = "39676beaa50db545cf15447fc94ec5513b64e85a48357a0625b9a04aef08a910" dependencies = [ "alloy-primitives", "alloy-rpc-types-anvil", @@ -525,9 +528,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10493fa300a2757d8134f584800fef545c15905c95122bed1f6dde0b0d9dae27" +checksum = "a9c8cad42fa936000be72ab80fcd97386a6a226c35c2989212756da9e76c1521" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -537,9 +540,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f7eb22670a972ad6c222a6c6dac3eef905579acffe9d63ab42be24c7d158535" +checksum = "01bac57c987c93773787619e20f89167db74d460a2d1d40f591d94fb7c22c379" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -548,20 +551,21 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b6f0482c82310366ec3dcf4e5212242f256a69fcf1a26e5017e6704091ee95" +checksum = "c2fe118e6c152d54cb4549b9835fb87d38b12754bb121375183ee3ec84bd0849" dependencies = [ "alloy-primitives", "derive_more", "serde", + "serde_with", ] [[package]] name = "alloy-rpc-types-engine" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24c171377c0684e3860385f6d93fbfcc8ecc74f6cce8304c822bf1a50bacce0" +checksum = "72a41624eb84bc743e414198bf10eb48b611a5554d6a9fd6205f7384d57dfd7f" dependencies = [ "alloy-consensus", "alloy-eips", @@ -577,9 +581,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b777b98526bbe5b7892ca22a7fd5f18ed624ff664a79f40d0f9f2bf94ba79a84" +checksum = "1cd1e1b4dcdf13eaa96343e5c0dafc2d2e8ce5d20b90347169d46a1df0dec210" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -599,9 +603,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15e8ccb6c16e196fcc968e16a71cd8ce4160f3ec5871d2ea196b75bf569ac02" +checksum = "01620baa48d3f49fc908c781eb91ded71f3226e719bb6404697c2851cac4e098" dependencies = [ "alloy-consensus", "alloy-eips", @@ -614,9 +618,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6a854af3fe8fce1cfe319fcf84ee8ba8cda352b14d3dd4221405b5fc6cce9e1" +checksum = "1bc33d9d0e0b3cfe9c2e82a1a427c9ed516fcfebe764f0adf7ceb8107f702dd1" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -628,9 +632,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc803e9b8d16154c856a738c376e002abe4b388e5fef91c8aebc8373e99fd45" +checksum = "d4fa9e9b3e613425d2a2ee1a322bdad5f1cedf835406fd4b59538822500b44bc" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -640,9 +644,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8d2c52adebf3e6494976c8542fbdf12f10123b26e11ad56f77274c16a2a039" +checksum = "f1b3b1078b8775077525bc9fe9f6577e815ceaecd6c412a4f3b4d8aa2836e8f6" dependencies = [ "alloy-primitives", "arbitrary", @@ -652,9 +656,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c0494d1e0f802716480aabbe25549c7f6bc2a25ff33b08fd332bbb4b7d06894" +checksum = "10ab1b8d4649bf7d0db8ab04e31658a6cc20364d920795484d886c35bed3bab4" dependencies = [ "alloy-primitives", "async-trait", @@ -667,15 +671,16 @@ dependencies = [ [[package]] name = "alloy-signer-aws" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0559495d87c099f7dbd0804145032e6a16ee675d1d2a15e98dc2658d64265cde" +checksum = "a46118173eb381b2911202a83dc4f39267027b0fe7d3533449f5e4ebc0eadcab" dependencies = [ "alloy-consensus", "alloy-network", "alloy-primitives", "alloy-signer", "async-trait", + "aws-config", "aws-sdk-kms", "k256", "spki", @@ -685,9 +690,9 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c2435eb8979a020763ced3fb478932071c56e5f75ea86db41f320915d325ba" +checksum = "7bdeec36c8d9823102b571b3eab8b323e053dc19c12da14a9687bd474129bf2a" dependencies = [ "alloy-consensus", "alloy-network", @@ -774,9 +779,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0107675e10c7f248bf7273c1e7fdb02409a717269cc744012e6f3c39959bfb" +checksum = "dce5129146a76ca6139a19832c75ad408857a56bcd18cd2c684183b8eacd78d8" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -798,9 +803,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78e3736701b5433afd06eecff08f0688a71a10e0e1352e0bbf0bed72f0dd4e35" +checksum = "e2379d998f46d422ec8ef2b61603bc28cda931e5e267aea1ebe71f62da61d101" dependencies = [ "alloy-json-rpc", "alloy-transport", @@ -813,9 +818,9 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79064b5a08259581cb5614580010007c2df6deab1e8f3e8c7af8d7e9227008f" +checksum = "041aa5db2e907692a9a93a0a908057665c03e59364e1fbbeed613511a0159289" dependencies = [ "alloy-json-rpc", "alloy-pubsub", @@ -833,9 +838,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77fd607158cb9bc54cbcfcaab4c5f36c5b26994c7dc58b6f095ce27a54f270f3" +checksum = "c6d44395e6793566e9c89bd82297cc4b0566655c1e78a1d69362640814784cc6" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -871,12 +876,12 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "1.0.24" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6acb36318dfa50817154064fea7932adf2eec3f51c86680e2b37d7e8906c66bb" +checksum = "3b5becb9c269a7d05a2f28d549f86df5a5dbc923e2667eff84fdecac8cda534c" dependencies = [ "alloy-primitives", - "darling", + "darling 0.21.3", "proc-macro2", "quote", "syn 2.0.104", @@ -897,6 +902,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anstyle" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" + [[package]] name = "anyhow" version = "1.0.98" @@ -1407,9 +1418,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.79.0" +version = "1.82.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a847168f15b46329fa32c7aca4e4f1a2e072f9b422f0adb19756f2e1457f111" +checksum = "b069e4973dc25875bbd54e4c6658bdb4086a846ee9ed50f328d4d4c33ebf9857" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1429,9 +1440,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.80.0" +version = "1.83.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b654dd24d65568738593e8239aef279a86a15374ec926ae8714e2d7245f34149" +checksum = "0b49e8fe57ff100a2f717abfa65bdd94e39702fa5ab3f60cddc6ac7784010c68" dependencies = [ "aws-credential-types", "aws-runtime", @@ -2093,6 +2104,12 @@ dependencies = [ "cc", ] +[[package]] +name = "colorchoice" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" + [[package]] name = "const-hex" version = "1.14.1" @@ -2231,8 +2248,18 @@ version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.20.11", + "darling_macro 0.20.11", +] + +[[package]] +name = "darling" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +dependencies = [ + "darling_core 0.21.3", + "darling_macro 0.21.3", ] [[package]] @@ -2249,13 +2276,39 @@ dependencies = [ "syn 2.0.104", ] +[[package]] +name = "darling_core" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "serde", + "strsim", + "syn 2.0.104", +] + [[package]] name = "darling_macro" version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ - "darling_core", + "darling_core 0.20.11", + "quote", + "syn 2.0.104", +] + +[[package]] +name = "darling_macro" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +dependencies = [ + "darling_core 0.21.3", "quote", "syn 2.0.104", ] @@ -3266,9 +3319,9 @@ dependencies = [ [[package]] name = "init4-bin-base" -version = "0.10.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ddbd1f201f57bed03448d703708a3c69b6905f437b787dc5c36bed13978738e" +checksum = "9e3002542e3353a2cb915ce582df044c67936f2a6d8b8e3f1be490eb97d47d13" dependencies = [ "alloy", "async-trait", @@ -4837,6 +4890,24 @@ dependencies = [ "serde_json", ] +[[package]] +name = "revm-inspectors" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc2c1ee7db275fd7176cd1d873fa033e5a16e029c5c793661c5a13381e80534" +dependencies = [ + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-rpc-types-trace", + "alloy-sol-types", + "anstyle", + "colorchoice", + "revm", + "serde", + "serde_json", + "thiserror 2.0.12", +] + [[package]] name = "revm-interpreter" version = "24.0.0" @@ -5426,7 +5497,7 @@ version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f" dependencies = [ - "darling", + "darling 0.20.11", "proc-macro2", "quote", "syn 2.0.104", @@ -5533,9 +5604,9 @@ dependencies = [ [[package]] name = "signet-bundle" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8ff6e22f8b1e585726875314d58dec283515cfe768103ac49fed64974ac9f1" +checksum = "62dbbd7ed31b758b8f485ff0fdd3362fb4dacba1c1ccb9ef25b3f3c033e5d3db" dependencies = [ "alloy", "serde", @@ -5549,9 +5620,9 @@ dependencies = [ [[package]] name = "signet-constants" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52b6a0ea8066c6183018f3e35dfa1992f0211c7b549c1fdc455957864709c63a" +checksum = "9eb160d9bc4a1af3928d4817d8999c6e2f850b1d6c6629f8916762fc0ade55f6" dependencies = [ "alloy", "serde", @@ -5561,12 +5632,13 @@ dependencies = [ [[package]] name = "signet-evm" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97afbaf5198f36bcaea7202cd1355290d8a44ad073273b5c0606511d3ac549ee" +checksum = "6b60daa282a454da9d5c57f5178c3cb43fe141bcda830c4d5ccc5ad71ce1b13f" dependencies = [ "alloy", "signet-extract", + "signet-journal", "signet-types", "signet-zenith", "thiserror 2.0.12", @@ -5576,9 +5648,9 @@ dependencies = [ [[package]] name = "signet-extract" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be11e3061948fdc9dbfe7b46222927f69464c78f9de1662a4a00bbbeb0f01e7d" +checksum = "b127dcc23ffa9b7fe3070de20b0b5dad652955e397ec0cfe36a4daa2983a58b0" dependencies = [ "alloy", "signet-types", @@ -5586,11 +5658,23 @@ dependencies = [ "tracing", ] +[[package]] +name = "signet-journal" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b11fc94e77dc7f54e2812f6af2fe89be67ec6ac40eff34da007093a9a61e510" +dependencies = [ + "alloy", + "futures-util", + "thiserror 2.0.12", + "trevm", +] + [[package]] name = "signet-sim" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b58266fb911c57e7dc6940d6d88ff49f7e0ee986793e79ee9a7946bf8f7130d" +checksum = "2a6af0af9bb0b043ad457961947a011e419566ee8c7155519b95f8f18c519bf4" dependencies = [ "alloy", "parking_lot", @@ -5606,9 +5690,9 @@ dependencies = [ [[package]] name = "signet-tx-cache" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5af67649c6816216093a7bbc92ec709c375f83229e21e3cc9237afcc5df9572" +checksum = "36d05904ca8dd199a15d0c702ff9b7796eb21ea8c6640c914ed68e1207393150" dependencies = [ "alloy", "eyre", @@ -5623,9 +5707,9 @@ dependencies = [ [[package]] name = "signet-types" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "986fc04855bab94573ed963369b260f6bed03523691dfc658b66e8b1abeb16d2" +checksum = "9e2a30138e59b4e9b7a4de713a03c4b96a0dffda8f26e834e6113e83e6176482" dependencies = [ "alloy", "chrono", @@ -5637,9 +5721,9 @@ dependencies = [ [[package]] name = "signet-zenith" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a15feed09fec0716a3af5638cc4d1cef11512d27786989f31914ca9d37db1b" +checksum = "d162e44b959915c8a1f526a3e3e46997371f6971538947479a7f7aa4c10b2732" dependencies = [ "alloy", "serde", @@ -6256,13 +6340,14 @@ dependencies = [ [[package]] name = "trevm" -version = "0.27.0" +version = "0.27.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8398be4100d211dfb673f0464f1b0315bad13dfb1ac6547b51c182f4dad67cbc" +checksum = "5b60f670aa2d7cef1ee02be666694b3baea3c3efe02fbc7989c09bc29b8b208a" dependencies = [ "alloy", "dashmap", "revm", + "revm-inspectors", "thiserror 2.0.12", "tracing", ] diff --git a/Cargo.toml b/Cargo.toml index 2be45b1a..a994eb73 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,17 +21,17 @@ path = "bin/builder.rs" integration = [] [dependencies] -init4-bin-base = { version = "0.10.1", features = ["perms"] } +init4-bin-base = { version = "0.12.2", features = ["perms", "aws"] } -signet-constants = { version = "0.9.0" } -signet-sim = { version = "0.9.0" } -signet-tx-cache = { version = "0.9.0" } -signet-types = { version = "0.9.0" } -signet-zenith = { version = "0.9.0" } +signet-constants = { version = "0.10.1" } +signet-sim = { version = "0.10.1" } +signet-tx-cache = { version = "0.10.1" } +signet-types = { version = "0.10.1" } +signet-zenith = { version = "0.10.1" } -trevm = { version = "0.27.0", features = ["concurrent-db", "test-utils"] } +trevm = { version = "0.27.8", features = ["concurrent-db", "test-utils"] } -alloy = { version = "1.0.19", features = [ +alloy = { version = "1.0.25", features = [ "full", "json-rpc", "signer-aws", diff --git a/README.md b/README.md index 2164c0f3..b855e32d 100644 --- a/README.md +++ b/README.md @@ -87,15 +87,13 @@ The Builder is configured via environment variables. The following values are su | `BUILDER_KEY` | Yes | AWS KMS key ID _or_ local private key for builder signing | | `BUILDER_REWARDS_ADDRESS` | Yes | Address receiving builder rewards | | `ROLLUP_BLOCK_GAS_LIMIT` | No | Override for block gas limit | -| `CONCURRENCY_LIMIT` | No | Max concurrent tasks the simulator uses | +| `CONCURRENCY_LIMIT` | No | Max concurrent tasks the simulator uses | | `OAUTH_CLIENT_ID` | Yes | Oauth client ID for the builder | | `OAUTH_CLIENT_SECRET` | Yes | Oauth client secret for the builder | | `OAUTH_AUTHENTICATE_URL` | Yes | Oauth authenticate URL for the builder for performing OAuth logins | | `OAUTH_TOKEN_URL` | Yes | Oauth token URL for the builder to get an Oauth2 access token | | `AUTH_TOKEN_REFRESH_INTERVAL` | Yes | The OAuth token refresh interval in seconds. | -| `SLOT_OFFSET` | Yes | Slot timing offset in seconds | -| `SLOT_DURATION` | Yes | Slot duration in seconds | -| `START_TIMESTAMP` | Yes | UNIX timestamp for slot 0 | +| `CHAIN_NAME` | Yes | The chain name ("pecorino", or the corresponding name) | --- diff --git a/src/config.rs b/src/config.rs index bcb0a7d3..6aab3341 100644 --- a/src/config.rs +++ b/src/config.rs @@ -154,6 +154,7 @@ pub struct BuilderConfig { pub concurrency_limit: Option, /// The slot calculator for the builder. + #[from_env(var = "CHAIN_NAME", desc = "The slot calculator for the builder")] pub slot_calculator: SlotCalculator, } From cc798ed205e5f64eaa0910833989b3c734beaa81 Mon Sep 17 00:00:00 2001 From: evalir Date: Wed, 10 Sep 2025 16:22:00 -0400 Subject: [PATCH 2/2] chore: make constants optional instead --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- README.md | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c52ebb7e..9e55fde0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3319,9 +3319,9 @@ dependencies = [ [[package]] name = "init4-bin-base" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3002542e3353a2cb915ce582df044c67936f2a6d8b8e3f1be490eb97d47d13" +checksum = "9f69beaf3dde29492ac14a781de91655f745468703dde7bd5613222f11331f68" dependencies = [ "alloy", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index a994eb73..ecda1907 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ path = "bin/builder.rs" integration = [] [dependencies] -init4-bin-base = { version = "0.12.2", features = ["perms", "aws"] } +init4-bin-base = { version = "0.12.3", features = ["perms", "aws"] } signet-constants = { version = "0.10.1" } signet-sim = { version = "0.10.1" } diff --git a/README.md b/README.md index b855e32d..937f4519 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,9 @@ The Builder is configured via environment variables. The following values are su | `OAUTH_TOKEN_URL` | Yes | Oauth token URL for the builder to get an Oauth2 access token | | `AUTH_TOKEN_REFRESH_INTERVAL` | Yes | The OAuth token refresh interval in seconds. | | `CHAIN_NAME` | Yes | The chain name ("pecorino", or the corresponding name) | +| `SLOT_OFFSET` | Yes | Slot timing offset in seconds. Optional if `CHAIN_NAME` is present | +| `SLOT_DURATION` | Yes | Slot duration in seconds. Optional if `CHAIN_NAME` is present | +| `START_TIMESTAMP` | Yes | UNIX timestamp for slot 0. Optional if `CHAIN_NAME` is present | ---