diff --git a/Cargo.lock b/Cargo.lock index 56af1f0..dca17fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -92,22 +92,22 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.10" +version = "3.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -175,7 +175,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" dependencies = [ "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -188,7 +188,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -227,7 +227,7 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -260,7 +260,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -277,9 +277,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "axum" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871" +checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425" dependencies = [ "axum-core", "base64", @@ -508,7 +508,7 @@ checksum = "89385e82b5d1821d2219e0b095efa2cc1f246cbf99080f3be46a1a85c0d392d9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -525,9 +525,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" dependencies = [ "serde", ] @@ -555,9 +555,9 @@ checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609" [[package]] name = "cc" -version = "1.2.45" +version = "1.2.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35900b6c8d709fb1d854671ae27aeaa9eec2f8b01b364e1619a40da3e6fe2afe" +checksum = "cd405d82c84ff7f35739f175f67d8b9fb7687a0e84ccdc78bd3568839827cf07" dependencies = [ "find-msvc-tools", "shlex", @@ -584,7 +584,7 @@ dependencies = [ "iana-time-zone", "num-traits", "serde", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -599,9 +599,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.51" +version = "4.5.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" +checksum = "c9e340e012a1bf4935f5282ed1436d1489548e8f72308207ea5df0e23d2d03f8" dependencies = [ "clap_builder", "clap_derive", @@ -609,9 +609,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.51" +version = "4.5.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" +checksum = "d76b5d13eaa18c901fd2f7fca939fefe3a0727a953561fefdf3b2922b8569d00" dependencies = [ "anstream", "anstyle", @@ -621,9 +621,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.60" +version = "4.5.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e602857739c5a4291dfa33b5a298aeac9006185229a700e5810a3ef7272d971" +checksum = "39615915e2ece2550c0149addac32fb5bd312c657f43845bb9088cb9c8a7c992" dependencies = [ "clap", ] @@ -637,7 +637,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -916,9 +916,9 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "typenum", @@ -954,7 +954,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -965,7 +965,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1025,7 +1025,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "unicode-xid", ] @@ -1083,7 +1083,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1115,7 +1115,7 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1176,7 +1176,7 @@ checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1451,7 +1451,7 @@ dependencies = [ "futures", "hex", "hmac", - "indexmap 2.12.0", + "indexmap 2.12.1", "lazy_static", "prometheus 0.14.0", "rand 0.8.5", @@ -1715,9 +1715,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" [[package]] name = "fixed-hash" @@ -1835,7 +1835,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -1876,9 +1876,9 @@ checksum = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a" [[package]] name = "generic-array" -version = "0.14.9" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -1939,7 +1939,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.12.0", + "indexmap 2.12.1", "slab", "tokio", "tokio-util", @@ -1964,9 +1964,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ "allocator-api2", "equivalent", @@ -2017,9 +2017,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hex-conservative" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" +checksum = "fda06d18ac606267c40c04e41b9947729bf8b9efe74bd4e82b61a5f26a510b9f" dependencies = [ "arrayvec", ] @@ -2041,12 +2041,11 @@ dependencies = [ [[package]] name = "http" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -2087,9 +2086,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" dependencies = [ "atomic-waker", "bytes", @@ -2142,9 +2141,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" +checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" dependencies = [ "base64", "bytes", @@ -2333,7 +2332,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2355,12 +2354,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" +checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" dependencies = [ "equivalent", - "hashbrown 0.16.0", + "hashbrown 0.16.1", "serde", "serde_core", ] @@ -2609,7 +2608,7 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96051b46fc183dc9cd4a223960ef37b9af631b55191852a8274bfef064cda20f" dependencies = [ - "hashbrown 0.16.0", + "hashbrown 0.16.1", ] [[package]] @@ -2728,7 +2727,7 @@ checksum = "4568f25ccbd45ab5d5603dc34318c1ec56b117531781260002151b8530a9f931" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -2847,7 +2846,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3032,7 +3031,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3055,7 +3054,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -3288,7 +3287,7 @@ checksum = "7347867d0a7e1208d93b46767be83e2b8f978c3dad35f775ac8d8847551d6fe1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3446,7 +3445,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3622,7 +3621,7 @@ dependencies = [ "bytecheck", "bytes", "hashbrown 0.15.5", - "indexmap 2.12.0", + "indexmap 2.12.1", "munge", "ptr_meta", "rancor", @@ -3640,7 +3639,7 @@ checksum = "bd83f5f173ff41e00337d97f6572e416d022ef8a19f371817259ae960324c482" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3675,7 +3674,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3907,7 +3906,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -3957,15 +3956,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.15.1" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04" +checksum = "10574371d41b0d9b2cff89418eda27da52bcaff2cc8741db26382a77c29131f1" dependencies = [ "base64", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.12.0", + "indexmap 2.12.1", "schemars 0.9.0", "schemars 1.1.0", "serde_core", @@ -3976,14 +3975,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.15.1" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955" +checksum = "08a72d8216842fdd57820dc78d840bef99248e35fb2554ff923319e60f2d686b" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4041,9 +4040,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.6" +version = "1.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" +checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad" dependencies = [ "libc", ] @@ -4106,9 +4105,9 @@ dependencies = [ [[package]] name = "sp1-lib" -version = "5.2.2" +version = "5.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce8ad0f153443d09d398eccb650a0b2dcbf829470e394e4bf60ec4379c7af93" +checksum = "eb1a9935d58cb1dcd757a1b10d727090f5b718f1f03b512d48f0c1952e6ead00" dependencies = [ "bincode", "serde", @@ -4117,9 +4116,9 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "5.2.2" +version = "5.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0244dee3a7a0f88cf71c3edf518f4fc97794ae870a107cbe7c810ac3fbf879cb" +checksum = "a7d2a6187e394c30097ea7a975a4832f172918690dc89a979f0fad67422d3a8b" dependencies = [ "bincode", "blake3", @@ -4240,7 +4239,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4262,9 +4261,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.110" +version = "2.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" dependencies = [ "proc-macro2", "quote", @@ -4288,7 +4287,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4357,7 +4356,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4368,7 +4367,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4479,7 +4478,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -4576,7 +4575,7 @@ version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.12.0", + "indexmap 2.12.1", "serde", "serde_spanned", "toml_datetime 0.6.11", @@ -4590,7 +4589,7 @@ version = "0.23.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d" dependencies = [ - "indexmap 2.12.0", + "indexmap 2.12.1", "toml_datetime 0.7.3", "toml_parser", "winnow", @@ -4629,9 +4628,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +checksum = "9cf146f99d442e8e68e585f5d798ccd3cad9a7835b917e09728880a862706456" dependencies = [ "bitflags", "bytes", @@ -4671,20 +4670,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] name = "tracing-core" -version = "0.1.34" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" dependencies = [ "once_cell", "valuable", @@ -4938,7 +4937,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "wasm-bindgen-shared", ] @@ -4988,9 +4987,9 @@ checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", - "windows-link 0.2.1", - "windows-result 0.4.1", - "windows-strings 0.5.1", + "windows-link", + "windows-result", + "windows-strings", ] [[package]] @@ -5001,7 +5000,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5012,15 +5011,9 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] -[[package]] -name = "windows-link" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" - [[package]] name = "windows-link" version = "0.2.1" @@ -5029,22 +5022,13 @@ checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-registry" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" -dependencies = [ - "windows-link 0.1.3", - "windows-result 0.3.4", - "windows-strings 0.4.2", -] - -[[package]] -name = "windows-result" -version = "0.3.4" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" dependencies = [ - "windows-link 0.1.3", + "windows-link", + "windows-result", + "windows-strings", ] [[package]] @@ -5053,16 +5037,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link 0.2.1", -] - -[[package]] -name = "windows-strings" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" -dependencies = [ - "windows-link 0.1.3", + "windows-link", ] [[package]] @@ -5071,7 +5046,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -5107,7 +5082,7 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -5132,7 +5107,7 @@ version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows-link 0.2.1", + "windows-link", "windows_aarch64_gnullvm 0.53.1", "windows_aarch64_msvc 0.53.1", "windows_i686_gnu 0.53.1", @@ -5241,9 +5216,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" dependencies = [ "memchr", ] @@ -5294,28 +5269,28 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "synstructure", ] [[package]] name = "zerocopy" -version = "0.8.27" +version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +checksum = "4ea879c944afe8a2b25fef16bb4ba234f47c694565e97383b36f3a878219065c" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.27" +version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +checksum = "cf955aa904d6040f70dc8e9384444cb1030aed272ba3cb09bbc4ab9e7c1f34f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5335,7 +5310,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", "synstructure", ] @@ -5356,7 +5331,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] [[package]] @@ -5389,5 +5364,5 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn 2.0.111", ] diff --git a/cli/src/cli.rs b/cli/src/cli.rs index 6e42f96..d15fe3c 100644 --- a/cli/src/cli.rs +++ b/cli/src/cli.rs @@ -1,4 +1,5 @@ use crate::commands::l2; +use crate::common::AuthorizeArgs; use crate::utils::{parse_contract_creation, parse_func_call, parse_hex, parse_hex_string}; use crate::{ commands::autocomplete, @@ -6,11 +7,12 @@ use crate::{ utils::parse_private_key, }; use clap::{ArgAction, Parser, Subcommand}; -use ethrex_common::types::TxType; +use ethrex_common::types::{AuthorizationTupleEntry, TxType}; use ethrex_common::{Address, Bytes, H256, H520}; use ethrex_l2_common::calldata::Value; use ethrex_l2_common::utils::get_address_from_secret_key; use ethrex_l2_rpc::signer::{LocalSigner, Signer}; +use ethrex_rlp::encode::RLPEncode; use ethrex_rpc::EthClient; use ethrex_rpc::clients::Overrides; use ethrex_rpc::types::block_identifier::{BlockIdentifier, BlockTag}; @@ -18,10 +20,12 @@ use ethrex_sdk::calldata::decode_calldata; use ethrex_sdk::{build_generic_tx, create2_deploy_from_bytecode, send_generic_transaction}; use ethrex_sdk::{compile_contract, git_clone}; use keccak_hash::keccak; +use rex_sdk::authorize::build_authorization_tuple; use rex_sdk::client::eth::get_token_balance; use rex_sdk::create::{ DETERMINISTIC_DEPLOYER, brute_force_create2, compute_create_address, compute_create2_address, }; +use rex_sdk::l2::authorize::parse_authorization_list; use rex_sdk::sign::{get_address_from_message_and_signature, sign_hash}; use rex_sdk::utils::to_checksum_address; use rex_sdk::{balance_in_eth, deploy, transfer, wait_for_transaction_receipt}; @@ -276,6 +280,13 @@ pub(crate) enum Command { #[arg(value_parser = parse_hex)] data: Bytes, }, + #[clap(about = "Authorize a delegated account")] + Authorize { + #[clap(flatten)] + args: AuthorizeArgs, + #[arg(long, default_value = "http://localhost:8545", env = "RPC_URL")] + rpc_url: Url, + }, } impl Command { @@ -456,6 +467,7 @@ impl Command { args.amount, from, args.to, + TxType::EIP1559, &args.private_key, &client, Overrides::default(), @@ -484,9 +496,27 @@ impl Command { parse_func_call(args._args)? }; + let tx_type = if args.auth_tuple.is_empty() { + TxType::EIP1559 + } else { + TxType::EIP7702 + }; + + let auth_list = parse_authorization_list(&args.auth_tuple)?; + let auth_list = if auth_list.is_empty() { + None + } else { + Some( + auth_list + .iter() + .map(AuthorizationTupleEntry::from) + .collect(), + ) + }; + let tx = build_generic_tx( &client, - TxType::EIP1559, + tx_type, args.to, from, calldata, @@ -498,6 +528,7 @@ impl Command { max_fee_per_gas: args.max_fee_per_gas, max_priority_fee_per_gas: args.max_priority_fee_per_gas, from: Some(from), + authorization_list: auth_list, ..Default::default() }, ) @@ -662,6 +693,21 @@ impl Command { print_calldata(0, elem); } } + Command::Authorize { args, rpc_url } => { + let client = EthClient::new(rpc_url)?; + + let auth_tuple = build_authorization_tuple( + &client, + args.delegated_address, + &args.private_key, + args.chain_id, + args.nonce, + ) + .await?; + let mut buf = Vec::new(); + auth_tuple.encode(&mut buf); + println!("0x{:x}", Bytes::from(buf)); + } }; Ok(()) } diff --git a/cli/src/commands/l2.rs b/cli/src/commands/l2.rs index 35e2f0c..ee3263d 100644 --- a/cli/src/commands/l2.rs +++ b/cli/src/commands/l2.rs @@ -1,14 +1,20 @@ use crate::{ cli::Command as EthCommand, - common::{BalanceArgs, CallArgs, DeployArgs, SendArgs, TransferArgs}, - utils::{parse_private_key, parse_u256}, + common::{AuthorizeArgs, BalanceArgs, CallArgs, DeployArgs, SendArgs, TransferArgs}, + utils::{parse_hex, parse_private_key, parse_u256}, }; use clap::Subcommand; use ethrex_common::{Address, H256, U256}; +use ethrex_common::{Bytes, types::TxType}; use ethrex_l2_common::utils::get_address_from_secret_key; +use ethrex_l2_rpc::clients::{get_batch_by_number, get_batch_number}; use ethrex_rpc::EthClient; +use ethrex_rpc::clients::Overrides; use ethrex_sdk::wait_for_l1_message_proof; +use rex_sdk::transfer; use rex_sdk::{ + l2::authorize::send_authorized_transaction, + l2::fees::fetch_fee_info, l2::{ deposit::{deposit_erc20, deposit_through_contract_call}, withdraw::{claim_erc20withdraw, claim_withdraw, withdraw, withdraw_erc20}, @@ -210,6 +216,12 @@ pub(crate) enum Command { Transfer { #[clap(flatten)] args: TransferArgs, + #[arg( + long, + required = false, + help = "The L2 address of a Fee Token to pay the gas fees" + )] + fee_token: Option
, #[arg( default_value = "http://localhost:1729", env = "RPC_URL", @@ -276,6 +288,86 @@ pub(crate) enum Command { )] rpc_url: Url, }, + #[clap(about = "Get L2 fees info for a block")] + GetFeeInfo { + #[arg( + long, + required = false, + help = "Block number to query the fees info for" + )] + block: Option, + #[arg( + long, + default_value = "http://localhost:1729", + env = "RPC_URL", + help = "L2 RPC URL" + )] + rpc_url: Url, + }, + #[clap(about = "Get the latest batch number")] + BatchNumber { + #[arg( + long, + default_value = "http://localhost:1729", + env = "RPC_URL", + help = "L2 RPC URL" + )] + rpc_url: Url, + }, + #[clap(about = "Get the latest batch or a batch by its number")] + BatchByNumber { + #[arg( + long, + short = 'b', + required = false, + help = "Batch number to retrieve information" + )] + batch_number: Option, + #[arg( + long, + default_value = "http://localhost:1729", + env = "RPC_URL", + help = "L2 RPC URL" + )] + rpc_url: Url, + }, + #[clap(about = "Send an ethrex sponsored transaction")] + SponsorTx { + #[arg(help = "Destination address of the transaction")] + to: Address, + #[arg(long, value_parser = parse_hex, help = "Calldata of the transaction")] + calldata: Option, + #[arg(long, help = "Hex-encoded RLP authorization tuples (EIP-7702)")] + auth_list: Vec, + #[clap( + long, + short = 'c', + required = false, + help = "Send the request asynchronously." + )] + cast: bool, + #[clap( + long, + short = 's', + required = false, + help = "Display only the tx hash." + )] + silent: bool, + #[arg( + long, + default_value = "http://localhost:1729", + env = "RPC_URL", + help = "L2 RPC URL" + )] + rpc_url: Url, + }, + #[clap(about = "Authorize a delegated account")] + Authorize { + #[clap(flatten)] + args: AuthorizeArgs, + #[arg(long, default_value = "http://localhost:1729", env = "RPC_URL")] + rpc_url: Url, + }, } impl Command { @@ -475,8 +567,48 @@ impl Command { Command::Nonce { account, rpc_url } => { Box::pin(async { EthCommand::Nonce { account, rpc_url }.run().await }).await? } - Command::Transfer { args, rpc_url } => { - Box::pin(async { EthCommand::Transfer { args, rpc_url }.run().await }).await? + Command::Transfer { + args, + fee_token, + rpc_url, + } => { + if args.token_address.is_some() { + todo!("Handle ERC20 transfers") + } + + if args.explorer_url { + todo!("Display transaction URL in the explorer") + } + + let from = get_address_from_secret_key(&args.private_key.secret_bytes()) + .map_err(|e| eyre::eyre!(e))?; + + let client = EthClient::new(rpc_url)?; + let tx_type = if fee_token.is_some() { + TxType::FeeToken + } else { + TxType::EIP1559 + }; + + let tx_hash = transfer( + args.amount, + from, + args.to, + tx_type, + &args.private_key, + &client, + Overrides { + fee_token, + ..Default::default() + }, + ) + .await?; + + println!("{tx_hash:#x}"); + + if !args.cast { + wait_for_transaction_receipt(tx_hash, &client, 100, args.silent).await?; + } } Command::Send { args, rpc_url } => { Box::pin(async { EthCommand::Send { args, rpc_url }.run().await }).await? @@ -490,6 +622,105 @@ impl Command { Command::ChainId { hex, rpc_url } => { Box::pin(async { EthCommand::ChainId { hex, rpc_url }.run().await }).await? } + Command::GetFeeInfo { block, rpc_url } => { + let client: EthClient = EthClient::new(rpc_url)?; + let fee_info = fetch_fee_info(&client, block).await?; + + let base_fee_vault_address = fee_info + .base_fee_vault_address + .map(|addr| format!("{addr:#x}")) + .unwrap_or_else(String::new); + let operator_fee_vault_address = fee_info + .operator_fee_vault_address + .map(|addr| format!("{addr:#x}")) + .unwrap_or_else(String::new); + let l1_fee_vault_address = fee_info + .l1_fee_vault_address + .map(|addr| format!("{addr:#x}")) + .unwrap_or_else(String::new); + + println!("L2 fee info for block {}:", fee_info.block_number); + println!(" Base fee vault: {base_fee_vault_address}"); + println!(" Operator fee vault: {operator_fee_vault_address}"); + println!(" L1 fee vault: {l1_fee_vault_address}"); + println!( + " Operator fee (wei/gas): {:#x}", + fee_info.operator_fee + ); + println!( + " L1 blob base fee (wei/blob-gas): {:#x}", + fee_info.blob_base_fee + ); + } + Command::BatchNumber { rpc_url } => { + let client = EthClient::new(rpc_url)?; + + let batch_number = get_batch_number(&client).await?; + println!("{batch_number}"); + } + Command::BatchByNumber { + batch_number, + rpc_url, + } => { + let client = EthClient::new(rpc_url)?; + let batch_number = match batch_number { + Some(number) => number, + None => get_batch_number(&client).await?, + }; + + let batch = match get_batch_by_number(&client, batch_number).await { + Ok(batch) => batch.batch, + Err(err) => { + println!("Batch {batch_number} not available yet: {err}"); + return Ok(()); + } + }; + + let commit_tx = batch + .commit_tx + .map(|tx| format!("{tx:#x}")) + .unwrap_or_else(String::new); + let verify_tx = batch + .verify_tx + .map(|tx| format!("{tx:#x}")) + .unwrap_or_else(String::new); + + // TODO: update with new fields + println!("Batch info for batch {}", batch.number); + println!(" Number: {}", batch.number); + println!(" First block: {}", batch.first_block); + println!(" Last block: {}", batch.last_block); + println!(" State root: {:#x}", batch.state_root); + println!( + " Privileged transactions hash: {:#x}", + batch.l1_in_messages_rolling_hash + ); + println!(" Commit tx: {commit_tx}"); + println!(" Verify tx: {verify_tx}"); + } + Command::SponsorTx { + rpc_url, + to, + calldata, + auth_list, + cast, + silent, + } => { + let client = EthClient::new(rpc_url)?; + let calldata = calldata.unwrap_or_else(Bytes::new); + + let tx_hash = + send_authorized_transaction(&client, to, calldata, &auth_list).await?; + + println!("{tx_hash:#x}"); + + if !cast { + wait_for_transaction_receipt(tx_hash, &client, 100, silent).await?; + } + } + Command::Authorize { args, rpc_url } => { + Box::pin(async { EthCommand::Authorize { args, rpc_url }.run().await }).await? + } }; Ok(()) } diff --git a/cli/src/common.rs b/cli/src/common.rs index fa389f4..c6359a5 100644 --- a/cli/src/common.rs +++ b/cli/src/common.rs @@ -99,6 +99,12 @@ pub struct SendArgs { help = "Display transaction URL in the explorer." )] pub explorer_url: bool, + #[clap( + long, + required = false, + help = "Hex encoded authorization tuple for EIP 7702 transactions" + )] + pub auth_tuple: Vec, #[clap( long = "private-key", short = 'k', @@ -214,3 +220,15 @@ pub struct DeployArgs { #[arg(last = true, hide = true)] pub _args: Vec, } + +#[derive(Parser)] +pub struct AuthorizeArgs { + #[arg(help = "Delegated address")] + pub delegated_address: Address, + #[arg(long, value_parser = parse_private_key, help = "Private key to sign the auth")] + pub private_key: SecretKey, + #[arg(long, required = false, help = "Nonce of the signer")] + pub nonce: Option, + #[arg(long, required = false, help = "Chain id of the network")] + pub chain_id: Option, +} diff --git a/cli/tests/tests.rs b/cli/tests/tests.rs index 03758ca..b33c04c 100644 --- a/cli/tests/tests.rs +++ b/cli/tests/tests.rs @@ -20,10 +20,10 @@ const DEFAULT_L2_RETURN_TRANSFER_PRIVATE_KEY: H256 = H256([ 0xbc, 0xdf, 0x20, 0x24, 0x9a, 0xbf, 0x0e, 0xd6, 0xd9, 0x44, 0xc0, 0x28, 0x8f, 0xad, 0x48, 0x9e, 0x33, 0xf6, 0x6b, 0x39, 0x60, 0xd9, 0xe6, 0x22, 0x9c, 0x1c, 0xd2, 0x14, 0xed, 0x3b, 0xbe, 0x31, ]); -// 0x39b37222708e21491b9126e0969a043baa09d5a7 -const DEFAULT_BRIDGE_ADDRESS: Address = H160([ - 0x39, 0xb3, 0x72, 0x22, 0x70, 0x8e, 0x21, 0x49, 0x1b, 0x91, 0x26, 0xe0, 0x96, 0x9a, 0x04, 0x3b, - 0xaa, 0x09, 0xd5, 0xa7, +// 0x13295e5562584289b27f92b28f5418269d3b7d82 +pub const DEFAULT_BRIDGE_ADDRESS: Address = H160([ + 0x13, 0x29, 0x5e, 0x55, 0x62, 0x58, 0x42, 0x89, 0xb2, 0x7f, 0x92, 0xb2, 0x8f, 0x54, 0x18, 0x26, + 0x9d, 0x3b, 0x7d, 0x82, ]); // 0x0007a881CD95B1484fca47615B64803dad620C8d const DEFAULT_PROPOSER_COINBASE_ADDRESS: Address = H160([ diff --git a/sdk/examples/keystore/main.rs b/sdk/examples/keystore/main.rs index eca3457..f541439 100644 --- a/sdk/examples/keystore/main.rs +++ b/sdk/examples/keystore/main.rs @@ -70,6 +70,7 @@ async fn main() -> Result<(), Box> { amount, rich_wallet_address, keystore_address, + TxType::EIP1559, &rich_wallet_pk, ð_client, Overrides::default(), diff --git a/sdk/examples/simple_usage.rs b/sdk/examples/simple_usage.rs index 579923e..f77ae32 100644 --- a/sdk/examples/simple_usage.rs +++ b/sdk/examples/simple_usage.rs @@ -1,4 +1,5 @@ use clap::Parser; +use ethrex_common::types::TxType; use ethrex_common::{Address, Bytes, U256}; use ethrex_l2_common::utils::get_address_from_secret_key; use ethrex_rpc::{ @@ -63,6 +64,7 @@ async fn main() { amount, from, to, + TxType::EIP1559, &args.private_key, ð_client, Overrides::default(), diff --git a/sdk/src/authorize.rs b/sdk/src/authorize.rs new file mode 100644 index 0000000..5295ca4 --- /dev/null +++ b/sdk/src/authorize.rs @@ -0,0 +1,77 @@ +use ethrex_common::{Address, U256, types::AuthorizationTuple}; +use ethrex_l2_common::utils::get_address_from_secret_key; +use ethrex_rlp::encode::RLPEncode; +use ethrex_rpc::{ + EthClient, + clients::EthClientError, + types::block_identifier::{BlockIdentifier, BlockTag}, +}; +use keccak_hash::keccak; +use secp256k1::ecdsa::RecoverableSignature; +use secp256k1::{Message, Secp256k1, SecretKey}; + +// MAGIC is 0x05 (crates/vm/levm/src/constants.rs) +const MAGIC: u8 = 0x05; + +pub fn make_auth_tuple( + signing_key: &SecretKey, + chain_id: u64, + delegated_code_addr: Address, + nonce: u64, +) -> AuthorizationTuple { + // keccak256(MAGIC || rlp([chain_id, address, nonce])) + let mut buf = Vec::with_capacity(1 + 128); + buf.push(MAGIC); + (U256::from(chain_id), delegated_code_addr, nonce).encode(&mut buf); + let digest = keccak(&buf); + let msg = Message::from_digest(digest.into()); + + let secp = Secp256k1::new(); + let sig: RecoverableSignature = secp.sign_ecdsa_recoverable(&msg, signing_key); + let (rec_id, sig_bytes) = sig.serialize_compact(); + + let r_signature = U256::from_big_endian(&sig_bytes[0..32]); + let s_signature = U256::from_big_endian(&sig_bytes[32..64]); + let y_parity = U256::from(Into::::into(rec_id)); + + AuthorizationTuple { + chain_id: U256::from(chain_id), + address: delegated_code_addr, + nonce, + y_parity, + r_signature, + s_signature, + } +} + +pub async fn build_authorization_tuple( + client: &EthClient, + delegated_address: Address, + private_key: &SecretKey, + chain_id: Option, + nonce: Option, +) -> Result { + let chain_id = match chain_id { + Some(id) => id, + None => client.get_chain_id().await?.as_u64(), + }; + + let from = get_address_from_secret_key(&private_key.secret_bytes()) + .map_err(|e| EthClientError::Custom(e.to_string()))?; + + let nonce = match nonce { + Some(nonce) => nonce, + None => { + client + .get_nonce(from, BlockIdentifier::Tag(BlockTag::Latest)) + .await? + } + }; + + Ok(make_auth_tuple( + private_key, + chain_id, + delegated_address, + nonce, + )) +} diff --git a/sdk/src/l2/authorize.rs b/sdk/src/l2/authorize.rs new file mode 100644 index 0000000..29948f0 --- /dev/null +++ b/sdk/src/l2/authorize.rs @@ -0,0 +1,33 @@ +use ethrex_common::{Address, Bytes, H256, types::AuthorizationTuple}; +use ethrex_l2_rpc::clients::send_ethrex_transaction; +use ethrex_rlp::decode::RLPDecode; +use ethrex_rpc::{EthClient, clients::EthClientError}; + +pub fn parse_authorization_list( + auth_list: &[String], +) -> Result, eyre::Error> { + let mut parsed = Vec::new(); + for auth_tuple_raw in auth_list { + let bytes = hex::decode(auth_tuple_raw.trim_start_matches("0x"))?; + let auth_tuple = AuthorizationTuple::decode(&bytes)?; + parsed.push(auth_tuple); + } + Ok(parsed) +} + +pub async fn send_authorized_transaction( + client: &EthClient, + to: Address, + calldata: Bytes, + auth_list_hex: &[String], +) -> Result { + let auth_list = parse_authorization_list(auth_list_hex) + .map_err(|e| EthClientError::Custom(e.to_string()))?; + let auth_list = if auth_list.is_empty() { + None + } else { + Some(auth_list) + }; + + send_ethrex_transaction(client, to, calldata, auth_list).await +} diff --git a/sdk/src/l2/deposit.rs b/sdk/src/l2/deposit.rs index b2b7138..61e5c77 100644 --- a/sdk/src/l2/deposit.rs +++ b/sdk/src/l2/deposit.rs @@ -24,6 +24,7 @@ pub async fn deposit_through_transfer( amount, from, bridge_address, + TxType::EIP1559, from_pk, eth_client, Overrides::default(), diff --git a/sdk/src/l2/fees.rs b/sdk/src/l2/fees.rs new file mode 100644 index 0000000..a3fae0a --- /dev/null +++ b/sdk/src/l2/fees.rs @@ -0,0 +1,51 @@ +use ethrex_common::{Address, U256}; +use ethrex_l2_rpc::clients::{ + get_base_fee_vault_address, get_l1_blob_base_fee_per_gas, get_l1_fee_vault_address, + get_operator_fee, get_operator_fee_vault_address, +}; +use ethrex_rpc::{ + EthClient, + clients::EthClientError, + types::block_identifier::{BlockIdentifier, BlockTag}, +}; + +#[derive(Clone, Debug)] +pub struct FeeInfo { + pub block_number: u64, + pub base_fee_vault_address: Option
, + pub operator_fee_vault_address: Option
, + pub l1_fee_vault_address: Option
, + pub operator_fee: U256, + pub blob_base_fee: u64, +} + +pub async fn fetch_fee_info( + client: &EthClient, + block: Option, +) -> Result { + let (block_identifier, block_number) = match block { + Some(block_number) => (BlockIdentifier::Number(block_number), block_number), + None => { + let latest_block = client.get_block_number().await?.as_u64(); + (BlockIdentifier::Tag(BlockTag::Latest), latest_block) + } + }; + + let base_fee_vault_address = + get_base_fee_vault_address(client, block_identifier.clone()).await?; + let operator_fee_vault_address = + get_operator_fee_vault_address(client, block_identifier.clone()).await?; + let l1_fee_vault_address = get_l1_fee_vault_address(client, block_identifier.clone()).await?; + + let operator_fee = get_operator_fee(client, block_identifier.clone()).await?; + let blob_base_fee = get_l1_blob_base_fee_per_gas(client, block_number).await?; + + Ok(FeeInfo { + block_number, + base_fee_vault_address, + operator_fee_vault_address, + l1_fee_vault_address, + operator_fee, + blob_base_fee, + }) +} diff --git a/sdk/src/l2/mod.rs b/sdk/src/l2/mod.rs index 96c52b3..bd3f759 100644 --- a/sdk/src/l2/mod.rs +++ b/sdk/src/l2/mod.rs @@ -1,4 +1,6 @@ +pub mod authorize; pub mod constants; pub mod deposit; +pub mod fees; pub mod privileged_transaction_data; pub mod withdraw; diff --git a/sdk/src/sdk.rs b/sdk/src/sdk.rs index b90e1b5..c4f24b5 100644 --- a/sdk/src/sdk.rs +++ b/sdk/src/sdk.rs @@ -24,6 +24,7 @@ pub mod keystore; pub mod sign; pub mod utils; +pub mod authorize; pub mod l2; #[derive(Debug, thiserror::Error)] @@ -38,23 +39,13 @@ pub async fn transfer( amount: U256, from: Address, to: Address, + tx_type: TxType, private_key: &SecretKey, client: &EthClient, mut overrides: Overrides, ) -> Result { overrides.value = Some(amount); - let tx = build_generic_tx( - client, - TxType::EIP1559, - to, - from, - Default::default(), - Overrides { - value: Some(amount), - ..Default::default() - }, - ) - .await?; + let tx = build_generic_tx(client, tx_type, to, from, Bytes::new(), overrides).await?; let signer = LocalSigner::new(*private_key).into(); send_generic_transaction(client, tx, &signer).await diff --git a/sdk/tests/tests.rs b/sdk/tests/tests.rs index 5bc6fba..a91c2df 100644 --- a/sdk/tests/tests.rs +++ b/sdk/tests/tests.rs @@ -1,3 +1,4 @@ +use ethrex_common::types::TxType; use ethrex_common::{Address, Bytes, H160, H256, U256}; use ethrex_l2_common::{calldata::Value, utils::get_address_from_secret_key}; use ethrex_l2_rpc::signer::{LocalSigner, Signer}; @@ -47,10 +48,10 @@ const DEFAULT_L2_RETURN_TRANSFER_PRIVATE_KEY: H256 = H256([ 0x33, 0xf6, 0x6b, 0x39, 0x60, 0xd9, 0xe6, 0x22, 0x9c, 0x1c, 0xd2, 0x14, 0xed, 0x3b, 0xbe, 0x31, ]); const DEFAULT_BRIDGE_ADDRESS: Address = ethrex_sdk::DEFAULT_BRIDGE_ADDRESS; -// 0x3e141f8f9f083024c6e1ec3de2509de5da47c354 +// 0x44669840b8f0aedaa707636272031b5e8d67516c const DEFAULT_ON_CHAIN_PROPOSER_ADDRESS: Address = H160([ - 0x3e, 0x14, 0x1f, 0x8f, 0x9f, 0x08, 0x30, 0x24, 0xc6, 0xe1, 0xec, 0x3d, 0xe2, 0x50, 0x9d, 0xe5, - 0xda, 0x47, 0xc3, 0x54, + 0x44, 0x66, 0x98, 0x40, 0xb8, 0xf0, 0xae, 0xda, 0xa7, 0x07, 0x63, 0x62, 0x72, 0x03, 0x1b, 0x5e, + 0x8d, 0x67, 0x51, 0x6c, ]); // 0x0007a881CD95B1484fca47615B64803dad620C8d const DEFAULT_PROPOSER_COINBASE_ADDRESS: Address = H160([ @@ -723,6 +724,7 @@ async fn perform_transfer( transfer_value, transferer_address, transfer_recipient_address, + TxType::EIP1559, transferer_private_key, proposer_client, Overrides::default(),