From 82396beb6fe4aca740904cad8c4ac08f9a8b6172 Mon Sep 17 00:00:00 2001 From: Aregnaz Harutyunyan <> Date: Tue, 14 Apr 2026 15:59:24 +0400 Subject: [PATCH 1/4] [EAN-Issue-2531] Updated supra-extensions to support new automation-registry and supra-nove genesis deployment --- Cargo.lock | 3516 ++++++++++++----- Cargo.toml | 3 +- crates/handler/src/handler.rs | 2 + crates/supra-extension/Cargo.toml | 1 + crates/supra-extension/build.rs | 192 +- crates/supra-extension/compile_config.toml | 15 +- .../supra-extension/src/contracts/configs.rs | 67 +- .../src/contracts/generator.rs | 871 +++- crates/supra-extension/src/contracts/mod.rs | 1 + .../src/contracts/supra_nova_contracts.rs | 67 + .../src/contracts/transaction.rs | 115 +- crates/supra-extension/src/lib.rs | 6 +- .../src/supra_contract_bindings/mod.rs | 4 +- .../supra_contracts_bindings.rs | 1661 ++++---- .../src/transactions/automated_transaction.rs | 30 +- .../src/transactions/automation_record.rs | 2 +- .../src/transactions/block_metadata.rs | 2 +- solidity/supra_contracts/foundry.toml | 5 +- .../src/SupraContractsBindings.sol | 3 +- .../supra_contracts/src/facets/CoreFacet.sol | 11 + .../src/libraries/LibCommon.sol | 11 +- .../src/libraries/LibUtils.sol | 12 + 22 files changed, 4556 insertions(+), 2041 deletions(-) create mode 100644 crates/supra-extension/src/contracts/supra_nova_contracts.rs diff --git a/Cargo.lock b/Cargo.lock index bf780df19e..8414e40505 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "addchain" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2e69442aa5628ea6951fa33e24efe8313f4321a91bd729fc2f75bdfc858570" +checksum = "2e33f6a175ec6a9e0aca777567f9ff7c3deefc255660df887e7fa3585e9801d8" dependencies = [ "num-bigint 0.3.3", "num-integer", @@ -26,7 +26,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", - "getrandom 0.3.3", + "getrandom 0.3.4", "once_cell", "version_check", "zerocopy", @@ -34,9 +34,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] @@ -49,9 +49,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f07655fedc35188f3c50ff8fc6ee45703ae14ef1bc7ae7d80e23a747012184e3" +checksum = "50ab0cd8afe573d1f7dc2353698a51b1f93aec362c8211e28cfd3948c6adba39" dependencies = [ "alloy-consensus", "alloy-contract", @@ -72,20 +72,21 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.2.23" +version = "0.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35d744058a9daa51a8cf22a3009607498fcf82d3cf4c5444dd8056cdf651f471" +checksum = "84e0378e959aa6a885897522080a990e80eb317f1e9a222a604492ea50e13096" dependencies = [ "alloy-primitives", "num_enum", + "serde", "strum", ] [[package]] name = "alloy-consensus" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e318e25fb719e747a7e8db1654170fc185024f3ed5b10f86c08d448a912f6e2" +checksum = "7f16daaf7e1f95f62c6c3bf8a3fc3d78b08ae9777810c0bb5e94966c7cd57ef0" dependencies = [ "alloy-eips", "alloy-primitives", @@ -105,14 +106,14 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 2.0.18", ] [[package]] name = "alloy-consensus-any" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "364380a845193a317bcb7a5398fc86cdb66c47ebe010771dde05f6869bf9e64a" +checksum = "118998d9015332ab1b4720ae1f1e3009491966a0349938a1f43ff45a8a4c6299" dependencies = [ "alloy-consensus", "alloy-eips", @@ -124,9 +125,9 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d39c80ffc806f27a76ed42f3351a455f3dc4f81d6ff92c8aad2cf36b7d3a34" +checksum = "7ac9e0c34dc6bce643b182049cdfcca1b8ce7d9c260cbdd561f511873b7e26cd" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -141,14 +142,15 @@ dependencies = [ "futures", "futures-util", "serde_json", - "thiserror", + "thiserror 2.0.18", + "tracing", ] [[package]] name = "alloy-core" -version = "1.5.1" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a651e1d9e50e6d0a78bd23cd08facb70459a94501c4036c7799a093e569a310" +checksum = "23e8604b0c092fabc80d075ede181c9b9e596249c70b99253082d7e689836529" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -159,9 +161,9 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "1.5.1" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d48a9101f4a67c22fae57489f1ddf3057b8ab4a368d8eac3be088b6e9d9c9d9" +checksum = "cc2db5c583aaef0255aa63a4fe827f826090142528bba48d1bf4119b62780cad" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -170,7 +172,7 @@ dependencies = [ "itoa", "serde", "serde_json", - "winnow", + "winnow 0.7.15", ] [[package]] @@ -183,7 +185,7 @@ dependencies = [ "alloy-rlp", "crc", "serde", - "thiserror", + "thiserror 2.0.18", ] [[package]] @@ -209,18 +211,31 @@ dependencies = [ "borsh", "k256", "serde", - "thiserror", + "thiserror 2.0.18", +] + +[[package]] +name = "alloy-eip7928" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8222b1d88f9a6d03be84b0f5e76bb60cd83991b43ad8ab6477f0e4a7809b98d" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "borsh", + "serde", ] [[package]] name = "alloy-eips" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c4d7c5839d9f3a467900c625416b24328450c65702eb3d8caff8813e4d1d33" +checksum = "e6ef28c9fdad22d4eec52d894f5f2673a0895f1e5ef196734568e68c0f6caca8" dependencies = [ "alloy-eip2124", "alloy-eip2930", "alloy-eip7702", + "alloy-eip7928", "alloy-primitives", "alloy-rlp", "alloy-serde", @@ -232,14 +247,13 @@ dependencies = [ "serde", "serde_with", "sha2 0.10.9", - "thiserror", ] [[package]] name = "alloy-genesis" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba4b1be0988c11f0095a2380aa596e35533276b8fa6c9e06961bbfe0aebcac5" +checksum = "bbf9480307b09d22876efb67d30cadd9013134c21f3a17ec9f93fd7536d38024" dependencies = [ "alloy-eips", "alloy-primitives", @@ -252,9 +266,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "1.5.1" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9914c147bb9b25f440eca68a31dc29f5c22298bfa7754aa802965695384122b0" +checksum = "e9dbe713da0c737d9e5e387b0ba790eb98b14dd207fe53eef50e19a5a8ec3dac" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -264,24 +278,24 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f72cf87cda808e593381fb9f005ffa4d2475552b7a6c5ac33d087bf77d82abd0" +checksum = "422d110f1c40f1f8d0e5562b0b649c35f345fccb7093d9f02729943dcd1eef71" dependencies = [ "alloy-primitives", "alloy-sol-types", "http", "serde", "serde_json", - "thiserror", + "thiserror 2.0.18", "tracing", ] [[package]] name = "alloy-network" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12aeb37b6f2e61b93b1c3d34d01ee720207c76fe447e2a2c217e433ac75b17f5" +checksum = "7197a66d94c4de1591cdc16a9bcea5f8cccd0da81b865b49aef97b1b4016e0fa" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -300,14 +314,14 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror", + "thiserror 2.0.18", ] [[package]] name = "alloy-network-primitives" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abd29ace62872083e30929cd9b282d82723196d196db589f3ceda67edcc05552" +checksum = "eb82711d59a43fdfd79727c99f270b974c784ec4eb5728a0d0d22f26716c87ef" dependencies = [ "alloy-consensus", "alloy-eips", @@ -318,9 +332,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "1.5.1" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7db950a29746be9e2f2c6288c8bd7a6202a81f999ce109a2933d2379970ec0fa" +checksum = "de3b431b4e72cd8bd0ec7a50b4be18e73dab74de0dba180eef171055e5d5926e" dependencies = [ "alloy-rlp", "arbitrary", @@ -329,29 +343,28 @@ dependencies = [ "const-hex", "derive_more", "foldhash 0.2.0", - "getrandom 0.3.3", + "getrandom 0.4.2", "hashbrown 0.16.1", - "indexmap 2.12.1", + "indexmap 2.14.0", "itoa", "k256", "keccak-asm", "paste", "proptest", "proptest-derive", - "rand 0.9.1", + "rand 0.9.4", "rapidhash", "ruint", "rustc-hash", "serde", "sha3", - "tiny-keccak", ] [[package]] name = "alloy-provider" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b710636d7126e08003b8217e24c09f0cca0b46d62f650a841736891b1ed1fc1" +checksum = "bf6b18b929ef1d078b834c3631e9c925177f3b23ddc6fa08a722d13047205876" dependencies = [ "alloy-chains", "alloy-consensus", @@ -376,10 +389,10 @@ dependencies = [ "lru", "parking_lot", "pin-project", - "reqwest", + "reqwest 0.13.2", "serde", "serde_json", - "thiserror", + "thiserror 2.0.18", "tokio", "tracing", "url", @@ -388,9 +401,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.12" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4" +checksum = "dc90b1e703d3c03f4ff7f48e82dd0bc1c8211ab7d079cd836a06fcfeb06651cb" dependencies = [ "alloy-rlp-derive", "arrayvec", @@ -399,20 +412,20 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.12" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73" +checksum = "f36834a5c0a2fa56e171bf256c34d70fca07d0c0031583edea1c4946b7889c9e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "alloy-rpc-client" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0882e72d2c1c0c79dcf4ab60a67472d3f009a949f774d4c17d0bdb669cfde05" +checksum = "94fcc9604042ca80bd37aa5e232ea1cd851f337e31e2babbbb345bc0b1c30de3" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -420,7 +433,7 @@ dependencies = [ "alloy-transport-http", "futures", "pin-project", - "reqwest", + "reqwest 0.13.2", "serde", "serde_json", "tokio", @@ -433,9 +446,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cf1398cb33aacb139a960fa3d8cf8b1202079f320e77e952a0b95967bf7a9f" +checksum = "4faad925d3a669ffc15f43b3deec7fbdf2adeb28a4d6f9cf4bc661698c0f8f4b" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -445,9 +458,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a63fb40ed24e4c92505f488f9dd256e2afaed17faa1b7a221086ebba74f4122" +checksum = "3823026d1ed239a40f12364fac50726c8daf1b6ab8077a97212c5123910429ed" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -456,9 +469,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eae0c7c40da20684548cbc8577b6b7447f7bf4ddbac363df95e3da220e41e72" +checksum = "59c095f92c4e1ff4981d89e9aa02d5f98c762a1980ab66bec49c44be11349da2" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -472,14 +485,14 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror", + "thiserror 2.0.18", ] [[package]] name = "alloy-serde" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0df1987ed0ff2d0159d76b52e7ddfc4e4fbddacc54d2fbee765e0d14d7c01b5" +checksum = "11ece63b89294b8614ab3f483560c08d016930f842bf36da56bf0b764a15c11e" dependencies = [ "alloy-primitives", "serde", @@ -488,9 +501,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff69deedee7232d7ce5330259025b868c5e6a52fa8dffda2c861fb3a5889b24" +checksum = "43f447aefab0f1c0649f71edc33f590992d4e122bc35fb9cdbbf67d4421ace85" dependencies = [ "alloy-primitives", "async-trait", @@ -498,14 +511,14 @@ dependencies = [ "either", "elliptic-curve", "k256", - "thiserror", + "thiserror 2.0.18", ] [[package]] name = "alloy-signer-local" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72cfe0be3ec5a8c1a46b2e5a7047ed41121d360d97f4405bb7c1c784880c86cb" +checksum = "f721f4bf2e4812e5505aaf5de16ef3065a8e26b9139ac885862d00b5a55a659a" dependencies = [ "alloy-consensus", "alloy-network", @@ -514,47 +527,47 @@ dependencies = [ "async-trait", "k256", "rand 0.8.5", - "thiserror", + "thiserror 2.0.18", ] [[package]] name = "alloy-sol-macro" -version = "1.5.1" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b96d5f5890605ba9907ce1e2158e2701587631dc005bfa582cf92dd6f21147" +checksum = "ab81bab693da9bb79f7a95b64b394718259fdd7e41dceeced4cad57cb71c4f6a" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "alloy-sol-macro-expander" -version = "1.5.1" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8247b7cca5cde556e93f8b3882b01dbd272f527836049083d240c57bf7b4c15" +checksum = "489f1620bb7e2483fb5819ed01ab6edc1d2f93939dce35a5695085a1afd1d699" dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", "const-hex", "heck", - "indexmap 2.12.1", + "indexmap 2.14.0", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.103", + "sha3", + "syn 2.0.117", "syn-solidity", - "tiny-keccak", ] [[package]] name = "alloy-sol-macro-input" -version = "1.5.1" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd54f38512ac7bae10bbc38480eefb1b9b398ca2ce25db9cc0c048c6411c4f1" +checksum = "56cef806ad22d4392c5fc83cf8f2089f988eb99c7067b4e0c6f1971fc1cca318" dependencies = [ "alloy-json-abi", "const-hex", @@ -564,25 +577,25 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.103", + "syn 2.0.117", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "1.5.1" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b09815b44899564566d4d56613d14fa9a274b1043a021f00468568752f449" +checksum = "a6df77fea9d6a2a75c0ef8d2acbdfd92286cc599983d3175ccdc170d3433d249" dependencies = [ "serde", - "winnow", + "winnow 0.7.15", ] [[package]] name = "alloy-sol-types" -version = "1.5.1" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1038284171df8bfd48befc0c7b78f667a7e2be162f45f07bd1c378078ebe58" +checksum = "64612d29379782a5dde6f4b6570d9c756d734d760c0c94c254d361e678a6591f" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -592,9 +605,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be98b07210d24acf5b793c99b759e9a696e4a2e67593aec0487ae3b3e1a2478c" +checksum = "8098f965442a9feb620965ba4b4be5e2b320f4ec5a3fff6bfa9e1ff7ef42bed1" dependencies = [ "alloy-json-rpc", "auto_impl", @@ -605,7 +618,7 @@ dependencies = [ "parking_lot", "serde", "serde_json", - "thiserror", + "thiserror 2.0.18", "tokio", "tower", "tracing", @@ -615,13 +628,14 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4198a1ee82e562cab85e7f3d5921aab725d9bd154b6ad5017f82df1695877c97" +checksum = "e8597d36d546e1dab822345ad563243ec3920e199322cb554ce56c8ef1a1e2e7" dependencies = [ "alloy-json-rpc", "alloy-transport", - "reqwest", + "itertools 0.14.0", + "reqwest 0.13.2", "serde_json", "tower", "tracing", @@ -630,30 +644,30 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.9.1" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3412d52bb97c6c6cc27ccc28d4e6e8cf605469101193b50b0bd5813b1f990b5" +checksum = "3f14b5d9b2c2173980202c6ff470d96e7c5e202c65a9f67884ad565226df7fbb" dependencies = [ "alloy-primitives", "alloy-rlp", - "arrayvec", "derive_more", "nybbles", "serde", "smallvec", + "thiserror 2.0.18", "tracing", ] [[package]] name = "alloy-tx-macros" -version = "1.1.3" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "333544408503f42d7d3792bfc0f7218b643d968a03d2c0ed383ae558fb4a76d0" +checksum = "d69722eddcdf1ce096c3ab66cf8116999363f734eb36fe94a148f4f71c85da84" dependencies = [ - "darling 0.21.3", + "darling", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -673,9 +687,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "annotate-snippets" -version = "0.12.5" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96401ca08501972288ecbcde33902fce858bf73fbcbdf91dab8c3a9544e106bb" +checksum = "92570a3f9c98e7e84df84b71d0965ac99b1871fcd75a3773a3bd1bad13f64cf7" dependencies = [ "anstyle", "memchr", @@ -684,12 +698,27 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.19" +version = "0.6.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" +dependencies = [ + "anstyle", + "anstyle-parse 0.2.7", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstream" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" +checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" dependencies = [ "anstyle", - "anstyle-parse", + "anstyle-parse 1.0.0", "anstyle-query", "anstyle-wincon", "colorchoice", @@ -699,9 +728,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" +checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" [[package]] name = "anstyle-parse" @@ -712,37 +741,46 @@ dependencies = [ "utf8parse", ] +[[package]] +name = "anstyle-parse" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" +dependencies = [ + "utf8parse", +] + [[package]] name = "anstyle-query" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.9" +version = "3.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "anyhow" -version = "1.0.98" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" +checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" [[package]] name = "arbitrary" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" +checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" dependencies = [ "derive_arbitrary", ] @@ -784,7 +822,7 @@ dependencies = [ "ark-std 0.5.0", "educe", "fnv", - "hashbrown 0.15.4", + "hashbrown 0.15.5", "itertools 0.13.0", "num-bigint 0.4.6", "num-integer", @@ -877,7 +915,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" dependencies = [ "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -915,7 +953,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -930,7 +968,7 @@ dependencies = [ "ark-std 0.5.0", "educe", "fnv", - "hashbrown 0.15.4", + "hashbrown 0.15.5", ] [[package]] @@ -1004,7 +1042,7 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -1048,9 +1086,6 @@ name = "arrayvec" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" -dependencies = [ - "serde", -] [[package]] name = "async-stream" @@ -1071,20 +1106,35 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "async-trait" -version = "0.1.88" +version = "0.1.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", +] + +[[package]] +name = "atomic" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a89cbf775b137e9b968e67227ef7f775587cde3fd31b0d8599dbd0f598a48340" +dependencies = [ + "bytemuck", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "aurora-engine-modexp" version = "1.2.0" @@ -1103,7 +1153,7 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -1112,11 +1162,33 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +[[package]] +name = "aws-lc-rs" +version = "1.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a054912289d18629dc78375ba2c3726a3afe3ff71b4edba9dedfca0e3446d1fc" +dependencies = [ + "aws-lc-sys", + "zeroize", +] + +[[package]] +name = "aws-lc-sys" +version = "0.39.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a25cf98105baa966497416dbd42565ce3a8cf8dbfd59803ec9ad46f3126399" +dependencies = [ + "cc", + "cmake", + "dunce", + "fs_extra", +] + [[package]] name = "az" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" +checksum = "be5eb007b7cacc6c660343e96f650fedf4b5a77512399eb952ca6642cf8d13f7" [[package]] name = "base16ct" @@ -1132,9 +1204,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.8.0" +version = "1.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" +checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" [[package]] name = "bincode" @@ -1182,15 +1254,15 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitcoin-io" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" +checksum = "2dee39a0ee5b4095224a0cfc6bf4cc1baf0f9624b96b367e53b66d974e51d953" [[package]] name = "bitcoin_hashes" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" +checksum = "26ec84b80c482df901772e931a9a681e26a1b9ee2302edeff23cb30328745c8b" dependencies = [ "bitcoin-io", "hex-conservative", @@ -1198,11 +1270,11 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" dependencies = [ - "serde", + "serde_core", ] [[package]] @@ -1218,17 +1290,38 @@ dependencies = [ "wyz", ] +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest 0.10.7", +] + +[[package]] +name = "blake2b_simd" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b79834656f71332577234b50bfc009996f7449e0c056884e6a02492ded0ca2f3" +dependencies = [ + "arrayref", + "arrayvec", + "constant_time_eq", +] + [[package]] name = "blake3" -version = "1.8.2" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0" +checksum = "4d2d5991425dfd0785aed03aedcf0b321d61975c9b5b3689c774a2610ae0b51e" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", + "cpufeatures 0.3.0", ] [[package]] @@ -1249,11 +1342,24 @@ dependencies = [ "generic-array", ] +[[package]] +name = "bls12_381" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3c196a77437e7cc2fb515ce413a6401291578b5afc8ecb29a3c7ab957f05941" +dependencies = [ + "ff 0.12.1", + "group 0.12.1", + "pairing 0.22.0", + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "blst" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fd49896f12ac9b6dcd7a5998466b9b58263a695a3dd1ecc1aaca2e12a90b080" +checksum = "dcdb4c7013139a150f9fc55d123186dbfaba0d912817466282c73ac49e71fb45" dependencies = [ "cc", "glob", @@ -1261,27 +1367,53 @@ dependencies = [ "zeroize", ] +[[package]] +name = "bon" +version = "3.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f47dbe92550676ee653353c310dfb9cf6ba17ee70396e1f7cf0a2020ad49b2fe" +dependencies = [ + "bon-macros", + "rustversion", +] + +[[package]] +name = "bon-macros" +version = "3.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "519bd3116aeeb42d5372c29d982d16d0170d3d4a5ed85fc7dd91642ffff3c67c" +dependencies = [ + "darling", + "ident_case", + "prettyplease", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.117", +] + [[package]] name = "borsh" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1da5ab77c1437701eeff7c88d968729e7766172279eab0676857b3d63af7a6f" +checksum = "cfd1e3f8955a5d7de9fab72fc8373fade9fb8a703968cb200ae3dc6cf08e185a" dependencies = [ "borsh-derive", + "bytes", "cfg_aliases", ] [[package]] name = "borsh-derive" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0686c856aa6aac0c4498f936d7d6a02df690f614c03e4d906d1018062b5c5e2c" +checksum = "bfcfdc083699101d5a7965e49925975f2f55060f94f9a05e7187be95d530ca59" dependencies = [ "once_cell", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -1290,11 +1422,21 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36f64beae40a84da1b4b26ff2761a5b895c12adc41dc25aaee1c4f2bbfe97a6e" +[[package]] +name = "bstr" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "bumpalo" -version = "3.18.1" +version = "3.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" +checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" [[package]] name = "byte-slice-cast" @@ -1302,6 +1444,12 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d" +[[package]] +name = "bytemuck" +version = "1.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" + [[package]] name = "byteorder" version = "1.5.0" @@ -1310,18 +1458,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" dependencies = [ "serde", ] [[package]] name = "c-kzg" -version = "2.1.1" +version = "2.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7318cfa722931cb5fe0838b98d3ce5621e75f6a6408abc21721d80de9223f2e4" +checksum = "6648ed1e4ea8e8a1a4a2c78e1cda29a3fd500bc622899c340d8525ea9a76b24a" dependencies = [ "blst", "cc", @@ -1340,19 +1488,27 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.49" +version = "1.2.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215" +checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" dependencies = [ "find-msvc-tools", + "jobserver", + "libc", "shlex", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cfg-if" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" @@ -1362,14 +1518,14 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.42" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" +checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" dependencies = [ "iana-time-zone", "num-traits", "serde", - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -1401,9 +1557,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.40" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f" +checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351" dependencies = [ "clap_builder", "clap_derive", @@ -1411,11 +1567,11 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.40" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e" +checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" dependencies = [ - "anstream", + "anstream 1.0.0", "anstyle", "clap_lex", "strsim", @@ -1423,21 +1579,30 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.40" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce" +checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "clap_lex" -version = "0.7.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" +checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" + +[[package]] +name = "cmake" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" +dependencies = [ + "cc", +] [[package]] name = "codspeed" @@ -1492,9 +1657,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" +checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "colored" @@ -1506,6 +1671,16 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "console" version = "0.15.11" @@ -1521,15 +1696,14 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.14.1" +version = "1.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e22e0ed40b96a48d3db274f72fd365bd78f67af39b6bbd47e8a15e1c6207ff" +checksum = "531185e432bb31db1ecda541e9e7ab21468d4d844ad7505e0546a49b4945d49b" dependencies = [ "cfg-if", - "cpufeatures", - "hex", + "cpufeatures 0.2.17", "proptest", - "serde", + "serde_core", ] [[package]] @@ -1540,9 +1714,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_format" -version = "0.2.34" +version = "0.2.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" +checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad" dependencies = [ "const_format_proc_macros", ] @@ -1560,15 +1734,15 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.3.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" +checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b" [[package]] name = "convert_case" -version = "0.7.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7" +checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9" dependencies = [ "unicode-segmentation", ] @@ -1608,11 +1782,20 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + [[package]] name = "crc" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" +checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" dependencies = [ "crc-catalog", ] @@ -1669,9 +1852,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "crypto-bigint" @@ -1697,94 +1880,58 @@ dependencies = [ [[package]] name = "csv" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" +checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" dependencies = [ "csv-core", "itoa", "ryu", - "serde", + "serde_core", ] [[package]] name = "csv-core" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d" +checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782" dependencies = [ "memchr", ] [[package]] name = "darling" -version = "0.20.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" -dependencies = [ - "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]] -name = "darling_core" -version = "0.20.11" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d" dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.103", + "darling_core", + "darling_macro", ] [[package]] name = "darling_core" -version = "0.21.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" +checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0" dependencies = [ - "fnv", "ident_case", "proc-macro2", "quote", "serde", "strsim", - "syn 2.0.103", -] - -[[package]] -name = "darling_macro" -version = "0.20.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" -dependencies = [ - "darling_core 0.20.11", - "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "darling_macro" -version = "0.21.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" dependencies = [ - "darling_core 0.21.3", + "darling_core", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -1813,12 +1960,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.4.0" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" +checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" dependencies = [ "powerfmt", - "serde", + "serde_core", ] [[package]] @@ -1840,50 +1987,51 @@ checksum = "74ef43543e701c01ad77d3a5922755c6a1d71b22d942cb8042be4994b380caff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "derive-where" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510c292c8cf384b1a340b816a9a6cf2599eb8f566a44949024af88418000c50b" +checksum = "d08b3a0bcc0d079199cd476b2cae8435016ec11d1c0986c6901c5ac223041534" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "derive_arbitrary" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" +checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "derive_more" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134" dependencies = [ "derive_more-impl", ] [[package]] name = "derive_more-impl" -version = "2.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" +checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.103", + "rustc_version 0.4.1", + "syn 2.0.117", "unicode-xid", ] @@ -1937,7 +2085,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -1948,9 +2096,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dyn-clone" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "ecdsa" @@ -1976,7 +2124,7 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -1988,6 +2136,12 @@ dependencies = [ "serde", ] +[[package]] +name = "elf" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4445909572dbd556c457c849c4ca58623d84b27c8fff1e74b0b4227d8b90d17b" + [[package]] name = "elliptic-curve" version = "0.13.8" @@ -1997,9 +2151,9 @@ dependencies = [ "base16ct", "crypto-bigint", "digest 0.10.7", - "ff", + "ff 0.13.1", "generic-array", - "group", + "group 0.13.0", "pkcs8", "rand_core 0.6.4", "sec1", @@ -2014,24 +2168,33 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + [[package]] name = "enum-ordinalize" -version = "4.3.0" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" +checksum = "4a1091a7bb1f8f2c4b28f1fe2cef4980ca2d410a3d727d67ecc3178c9b0800f0" dependencies = [ "enum-ordinalize-derive", ] [[package]] name = "enum-ordinalize-derive" -version = "4.3.1" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" +checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -2040,14 +2203,25 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" +[[package]] +name = "erased-serde" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2add8a07dd6a8d93ff627029c51de145e12686fbc36ecb298ac22e74cf02dec" +dependencies = [ + "serde", + "serde_core", + "typeid", +] + [[package]] name = "errno" -version = "0.3.12" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2059,7 +2233,7 @@ dependencies = [ "alloy-provider", "anyhow", "indicatif", - "revm", + "revm 29.0.0", "tokio", ] @@ -2068,7 +2242,7 @@ name = "example-cheatcode-inspector" version = "0.0.0" dependencies = [ "anyhow", - "revm", + "revm 29.0.0", ] [[package]] @@ -2076,14 +2250,14 @@ name = "example-contract-deployment" version = "0.0.0" dependencies = [ "anyhow", - "revm", + "revm 29.0.0", ] [[package]] name = "example-custom-opcodes" version = "0.0.0" dependencies = [ - "revm", + "revm 29.0.0", ] [[package]] @@ -2091,7 +2265,7 @@ name = "example-custom-precompile-journal" version = "0.1.0" dependencies = [ "anyhow", - "revm", + "revm 29.0.0", ] [[package]] @@ -2099,8 +2273,8 @@ name = "example-database-components" version = "0.0.0" dependencies = [ "auto_impl", - "revm", - "thiserror", + "revm 29.0.0", + "thiserror 2.0.18", ] [[package]] @@ -2110,7 +2284,7 @@ dependencies = [ "alloy-provider", "alloy-sol-types", "anyhow", - "revm", + "revm 29.0.0", "tokio", ] @@ -2118,7 +2292,7 @@ dependencies = [ name = "example-my-evm" version = "0.0.0" dependencies = [ - "revm", + "revm 29.0.0", ] [[package]] @@ -2129,7 +2303,7 @@ dependencies = [ "alloy-provider", "alloy-sol-types", "anyhow", - "revm", + "revm 29.0.0", "tokio", ] @@ -2141,15 +2315,25 @@ dependencies = [ "alloy-provider", "alloy-sol-types", "anyhow", - "revm", + "revm 29.0.0", "tokio", ] +[[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + [[package]] name = "fastrand" -version = "2.3.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "fastrlp" @@ -2173,12 +2357,24 @@ dependencies = [ "bytes", ] +[[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "bitvec", + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "ff" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" dependencies = [ + "bitvec", "byteorder", "ff_derive", "rand_core 0.6.4", @@ -2201,10 +2397,24 @@ dependencies = [ ] [[package]] -name = "find-msvc-tools" -version = "0.1.5" +name = "figment" +version = "0.10.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" +checksum = "8cb01cd46b0cf372153850f4c6c272d9cbea2da513e07538405148f95bd789f3" +dependencies = [ + "atomic", + "pear", + "serde", + "toml 0.8.23", + "uncased", + "version_check", +] + +[[package]] +name = "find-msvc-tools" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "fixed-hash" @@ -2220,11 +2430,10 @@ dependencies = [ [[package]] name = "flate2" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" dependencies = [ - "crc32fast", "miniz_oxide", "zlib-rs", ] @@ -2248,27 +2457,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] -name = "foreign-types" -version = "0.3.2" +name = "form_urlencoded" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ - "foreign-types-shared", + "percent-encoding", ] [[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" +name = "foundry-block-explorers" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "ff814624bb21bfe43b70fb736ab39527b405d04cdc94d90b7e182fba28b25ec7" dependencies = [ - "percent-encoding", + "alloy-chains", + "alloy-json-abi", + "alloy-primitives", + "foundry-compilers", + "reqwest 0.12.28", + "semver 1.0.28", + "serde", + "serde_json", + "thiserror 2.0.18", + "tracing", ] [[package]] @@ -2287,14 +2499,16 @@ dependencies = [ "itertools 0.14.0", "path-slash", "rayon", - "semver 1.0.26", + "semver 1.0.28", "serde", "serde_json", + "sha2 0.10.9", "solar-compiler", "svm-rs", - "thiserror", + "svm-rs-builds", + "thiserror 2.0.18", "tracing", - "winnow", + "winnow 0.7.15", "yansi", ] @@ -2321,10 +2535,10 @@ dependencies = [ "path-slash", "rayon", "regex", - "semver 1.0.26", + "semver 1.0.28", "serde", "serde_json", - "thiserror", + "thiserror 2.0.18", "tracing", "yansi", ] @@ -2340,7 +2554,7 @@ dependencies = [ "foundry-compilers-artifacts-solc", "foundry-compilers-core", "path-slash", - "semver 1.0.26", + "semver 1.0.28", "serde", ] @@ -2355,14 +2569,60 @@ dependencies = [ "dunce", "path-slash", "regex", - "semver 1.0.26", + "semver 1.0.28", "serde", "serde_json", - "thiserror", + "svm-rs", + "thiserror 2.0.18", + "tokio", "walkdir", "xxhash-rust", ] +[[package]] +name = "foundry-config" +version = "1.4.1" +source = "git+https://github.com/foundry-rs/foundry.git?tag=v1.4.1#cf7746048646f2ecff48246dd61e265e49ab16f0" +dependencies = [ + "alloy-chains", + "alloy-primitives", + "clap", + "dirs", + "dunce", + "eyre", + "figment", + "foundry-block-explorers", + "foundry-compilers", + "glob", + "globset", + "heck", + "itertools 0.14.0", + "mesc", + "number_prefix", + "path-slash", + "rayon", + "regex", + "reqwest 0.12.28", + "revm 29.0.1", + "semver 1.0.28", + "serde", + "serde_json", + "solar-compiler", + "soldeer-core", + "thiserror 2.0.18", + "toml 0.9.12+spec-1.1.0", + "toml_edit 0.23.10+spec-1.0.0", + "tracing", + "walkdir", + "yansi", +] + +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "funty" version = "2.0.0" @@ -2371,9 +2631,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" dependencies = [ "futures-channel", "futures-core", @@ -2386,9 +2646,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" dependencies = [ "futures-core", "futures-sink", @@ -2396,15 +2656,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" [[package]] name = "futures-executor" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" dependencies = [ "futures-core", "futures-task", @@ -2413,32 +2673,32 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" +checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" [[package]] name = "futures-macro" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "futures-sink" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" [[package]] name = "futures-task" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" [[package]] name = "futures-timer" @@ -2448,9 +2708,9 @@ checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-channel", "futures-core", @@ -2460,7 +2720,6 @@ dependencies = [ "futures-task", "memchr", "pin-project-lite", - "pin-utils", "slab", ] @@ -2478,9 +2737,9 @@ checksum = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a" [[package]] name = "generic-array" -version = "0.14.7" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2" dependencies = [ "typenum", "version_check", @@ -2489,45 +2748,83 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.1+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", "js-sys", "libc", - "r-efi", - "wasi 0.14.2+wasi-0.2.4", + "r-efi 5.3.0", + "wasip2", "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +dependencies = [ + "cfg-if", + "libc", + "r-efi 6.0.0", + "wasip2", + "wasip3", +] + [[package]] name = "glob" -version = "0.3.2" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" + +[[package]] +name = "globset" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" +checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata", + "regex-syntax", +] [[package]] name = "gmp-mpfr-sys" -version = "1.6.8" -source = "git+ssh://git@github.com/Entropy-Foundation/bicycl-rs?rev=05f9c22eef4c30f55e9633640269e7c9296510f0#05f9c22eef4c30f55e9633640269e7c9296510f0" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cfc928d8ff4ab3767a3674cf55f81186436fb6070866bb1443ffe65a640d2d6" dependencies = [ - "cc", "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", +] + +[[package]] +name = "group" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +dependencies = [ + "ff 0.12.1", + "memuse", + "rand_core 0.6.4", + "subtle", ] [[package]] @@ -2536,19 +2833,62 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff", + "ff 0.13.1", "rand_core 0.6.4", "subtle", ] +[[package]] +name = "h2" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http", + "indexmap 2.14.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" -version = "2.6.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" +checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" dependencies = [ "cfg-if", "crunchy", + "zerocopy", +] + +[[package]] +name = "halo2" +version = "0.1.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a23c779b38253fe1538102da44ad5bd5378495a61d2c4ee18d64eaa61ae5995" +dependencies = [ + "halo2_proofs", +] + +[[package]] +name = "halo2_proofs" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e925780549adee8364c7f2b685c753f6f3df23bde520c67416e93bf615933760" +dependencies = [ + "blake2b_simd", + "ff 0.12.1", + "group 0.12.1", + "pasta_curves 0.4.1", + "rand_core 0.6.4", + "rayon", ] [[package]] @@ -2571,12 +2911,11 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hashbrown" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ "allocator-api2", - "equivalent", "foldhash 0.1.5", ] @@ -2586,11 +2925,19 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ + "allocator-api2", + "equivalent", "foldhash 0.2.0", "serde", "serde_core", ] +[[package]] +name = "hashbrown" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" + [[package]] name = "heck" version = "0.5.0" @@ -2608,15 +2955,12 @@ name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -dependencies = [ - "serde", -] [[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", ] @@ -2630,14 +2974,22 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "home" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" +dependencies = [ + "windows-sys 0.61.2", +] + [[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", ] @@ -2672,13 +3024,15 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "hyper" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" +checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca" dependencies = [ + "atomic-waker", "bytes", "futures-channel", - "futures-util", + "futures-core", + "h2", "http", "http-body", "httparse", @@ -2691,48 +3045,30 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.7" +version = "0.27.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" +checksum = "c2b52f86d1d4bc0d6b4e6826d960b1b333217e07d36b882dca570a5e1c48895b" dependencies = [ "http", "hyper", "hyper-util", "rustls", "rustls-native-certs", - "rustls-pki-types", "tokio", "tokio-rustls", "tower-service", "webpki-roots", ] -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - [[package]] name = "hyper-util" -version = "0.1.14" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb" +checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" dependencies = [ "base64", "bytes", "futures-channel", - "futures-core", "futures-util", "http", "http-body", @@ -2741,17 +3077,19 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2", + "system-configuration", "tokio", "tower-service", "tracing", + "windows-registry", ] [[package]] name = "iana-time-zone" -version = "0.1.63" +version = "0.1.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2773,12 +3111,13 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" dependencies = [ "displaydoc", "potential_utf", + "utf8_iter", "yoke", "zerofrom", "zerovec", @@ -2786,9 +3125,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" dependencies = [ "displaydoc", "litemap", @@ -2799,11 +3138,10 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" dependencies = [ - "displaydoc", "icu_collections", "icu_normalizer_data", "icu_properties", @@ -2814,42 +3152,38 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" +checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" [[package]] name = "icu_properties" -version = "2.0.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" dependencies = [ - "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", "icu_provider", - "potential_utf", "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "2.0.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" +checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" [[package]] name = "icu_provider" -version = "2.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" dependencies = [ "displaydoc", "icu_locale_core", - "stable_deref_trait", - "tinystr", "writeable", "yoke", "zerofrom", @@ -2857,6 +3191,12 @@ dependencies = [ "zerovec", ] +[[package]] +name = "id-arena" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" + [[package]] name = "ident_case" version = "1.0.1" @@ -2865,9 +3205,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ "idna_adapter", "smallvec", @@ -2884,6 +3224,22 @@ dependencies = [ "icu_properties", ] +[[package]] +name = "ignore" +version = "0.4.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3d782a365a015e0f5c04902246139249abf769125006fbe7649e2ee88169b4a" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata", + "same-file", + "walkdir", + "winapi-util", +] + [[package]] name = "impl-codec" version = "0.6.0" @@ -2901,9 +3257,15 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] +[[package]] +name = "indenter" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "964de6e86d545b246d84badc0fef527924ace5134f30641c203ef52ba83f58d5" + [[package]] name = "index_vec" version = "0.1.4" @@ -2923,13 +3285,13 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.12.1" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "arbitrary", "equivalent", - "hashbrown 0.16.1", + "hashbrown 0.17.0", "serde", "serde_core", ] @@ -2947,6 +3309,12 @@ dependencies = [ "web-time", ] +[[package]] +name = "inlinable_string" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" + [[package]] name = "inturn" version = "0.1.2" @@ -2962,15 +3330,15 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" +checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" [[package]] name = "iri-string" -version = "0.7.8" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20" dependencies = [ "memchr", "serde", @@ -2978,20 +3346,20 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "is_terminal_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itertools" @@ -3031,95 +3399,170 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] -name = "js-sys" -version = "0.3.77" +name = "jni" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ - "once_cell", - "wasm-bindgen", + "cesu8", + "cfg-if", + "combine", + "jni-sys 0.3.1", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", ] [[package]] -name = "k256" -version = "0.13.4" +name = "jni-sys" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" +checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258" dependencies = [ - "cfg-if", - "ecdsa", - "elliptic-curve", - "once_cell", - "serdect", - "sha2 0.10.9", + "jni-sys 0.4.1", ] [[package]] -name = "keccak" -version = "0.1.5" +name = "jni-sys" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" dependencies = [ - "cpufeatures", + "jni-sys-macros", ] [[package]] -name = "keccak-asm" -version = "0.1.4" +name = "jni-sys-macros" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "505d1856a39b200489082f90d897c3f07c455563880bc5952e38eabf731c83b6" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" dependencies = [ - "digest 0.10.7", - "sha3-asm", + "quote", + "syn 2.0.117", ] [[package]] -name = "kzg-rs" -version = "0.2.7" +name = "jobserver" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9201effeea3fcc93b587904ae2df9ce97e433184b9d6d299e9ebc9830a546636" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ - "ff", - "hex", - "serde_arrays", - "sha2 0.10.9", - "sp1_bls12_381", - "spin", + "getrandom 0.3.4", + "libc", ] [[package]] -name = "lazy_static" -version = "1.5.0" +name = "js-sys" +version = "0.3.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2964e92d1d9dc3364cae4d718d93f227e3abb088e747d92e0395bfdedf1c12ca" +dependencies = [ + "cfg-if", + "futures-util", + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "jubjub" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a575df5f985fe1cd5b2b05664ff6accfc46559032b954529fd225a2168d27b0f" +dependencies = [ + "bitvec", + "bls12_381", + "ff 0.12.1", + "group 0.12.1", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "k256" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" +dependencies = [ + "cfg-if", + "ecdsa", + "elliptic-curve", + "once_cell", + "serdect", + "sha2 0.10.9", +] + +[[package]] +name = "keccak" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" +dependencies = [ + "cpufeatures 0.2.17", +] + +[[package]] +name = "keccak-asm" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa468878266ad91431012b3e5ef1bf9b170eab22883503a318d46857afa4579a" +dependencies = [ + "digest 0.10.7", + "sha3-asm", +] + +[[package]] +name = "kzg-rs" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee8b4f55c3dedcfaa8668de1dfc8469e7a32d441c28edf225ed1f566fb32977d" +dependencies = [ + "ff 0.13.1", + "hex", + "serde_arrays", + "sha2 0.10.9", + "sp1_bls12_381", + "spin", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ "spin", ] +[[package]] +name = "leb128fmt" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + [[package]] name = "libc" -version = "0.2.174" +version = "0.2.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" +checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" [[package]] name = "libm" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" +checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.12" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" +checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" dependencies = [ - "bitflags", "libc", ] @@ -3171,39 +3614,41 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.9.4" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" +checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" [[package]] name = "lock_api" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ - "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.27" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +dependencies = [ + "value-bag", +] [[package]] name = "lru" -version = "0.13.0" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465" +checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39" dependencies = [ - "hashbrown 0.15.4", + "hashbrown 0.16.1", ] [[package]] @@ -3220,14 +3665,47 @@ checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "memchr" -version = "2.7.5" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" + +[[package]] +name = "memuse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d97bbf43eb4f088f8ca469930cde17fa036207c9a5e02ccc5107c4e8b17c964" + +[[package]] +name = "mesc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d04b0347d2799ef17df4623dbcb03531031142105168e0c549e0bf1f980e9e7e" +dependencies = [ + "serde", + "serde_json", + "thiserror 1.0.69", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] [[package]] name = "miniz_oxide" @@ -3241,30 +3719,13 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" -dependencies = [ - "libc", - "wasi 0.11.1+wasi-snapshot-preview1", - "windows-sys 0.59.0", -] - -[[package]] -name = "native-tls" -version = "0.2.14" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" +checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" dependencies = [ "libc", - "log", - "openssl", - "openssl-probe 0.1.6", - "openssl-sys", - "schannel", - "security-framework 2.11.1", - "security-framework-sys", - "tempfile", + "wasi", + "windows-sys 0.61.2", ] [[package]] @@ -3319,9 +3780,9 @@ dependencies = [ [[package]] name = "num-conv" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967" [[package]] name = "num-integer" @@ -3376,23 +3837,24 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.3" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26" dependencies = [ "num_enum_derive", + "rustversion", ] [[package]] name = "num_enum_derive" -version = "0.7.3" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -3403,9 +3865,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "nybbles" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa11e84403164a9f12982ab728f3c67c6fd4ab5b5f0254ffc217bdbd3b28ab0" +checksum = "0d49ff0c0d00d4a502b39df9af3a525e1efeb14b9dabb5bb83335284c1309210" dependencies = [ "alloy-rlp", "cfg-if", @@ -3417,15 +3879,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "once_cell_polyfill" -version = "1.70.1" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "once_map" @@ -3452,7 +3914,7 @@ dependencies = [ "alloy-primitives", "alloy-sol-types", "auto_impl", - "revm", + "revm 29.0.0", "rstest", "serde", "serde_json", @@ -3465,56 +3927,12 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" -[[package]] -name = "openssl" -version = "0.10.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.103", -] - -[[package]] -name = "openssl-probe" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" - [[package]] name = "openssl-probe" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" -[[package]] -name = "openssl-sys" -version = "0.9.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "option-ext" version = "0.2.0" @@ -3534,25 +3952,39 @@ dependencies = [ ] [[package]] -name = "p3-baby-bear" -version = "0.2.3-succinct" +name = "p3-bn254-fr" +version = "0.3.2-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7521838ecab2ddf4f7bc4ceebad06ec02414729598485c1ada516c39900820e8" +checksum = "9abf208fbfe540d6e2a6caaa2a9a345b1c8cb23ffdcdfcc6987244525d4fc821" dependencies = [ + "ff 0.13.1", "num-bigint 0.4.6", "p3-field", - "p3-mds", "p3-poseidon2", "p3-symmetric", "rand 0.8.5", "serde", ] +[[package]] +name = "p3-challenger" +version = "0.3.2-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42b725b453bbb35117a1abf0ddfd900b0676063d6e4231e0fa6bb0d76018d8ad" +dependencies = [ + "p3-field", + "p3-maybe-rayon", + "p3-symmetric", + "p3-util", + "serde", + "tracing", +] + [[package]] name = "p3-dft" -version = "0.2.3-succinct" +version = "0.3.2-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46414daedd796f1eefcdc1811c0484e4bced5729486b6eaba9521c572c76761a" +checksum = "56a1f81101bff744b7ebba7f4497e917a2c6716d6e62736e4a56e555a2d98cb7" dependencies = [ "p3-field", "p3-matrix", @@ -3563,9 +3995,9 @@ dependencies = [ [[package]] name = "p3-field" -version = "0.2.3-succinct" +version = "0.3.2-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48948a0516b349e9d1cdb95e7236a6ee010c44e68c5cc78b4b92bf1c4022a0d9" +checksum = "36459d4acb03d08097d713f336c7393990bb489ab19920d4f68658c7a5c10968" dependencies = [ "itertools 0.12.1", "num-bigint 0.4.6", @@ -3575,11 +4007,26 @@ dependencies = [ "serde", ] +[[package]] +name = "p3-koala-bear" +version = "0.3.2-succinct" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1f52bcb6be38bdc8fa6b38b3434d4eedd511f361d4249fd798c6a5ef817b40" +dependencies = [ + "num-bigint 0.4.6", + "p3-field", + "p3-mds", + "p3-poseidon2", + "p3-symmetric", + "rand 0.8.5", + "serde", +] + [[package]] name = "p3-matrix" -version = "0.2.3-succinct" +version = "0.3.2-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4de3f373589477cb735ea58e125898ed20935e03664b4614c7fac258b3c42f" +checksum = "5583e9cd136a4095a25c41a9edfdcce2dfae58ef01639317813bdbbd5b55c583" dependencies = [ "itertools 0.12.1", "p3-field", @@ -3592,15 +4039,15 @@ dependencies = [ [[package]] name = "p3-maybe-rayon" -version = "0.2.3-succinct" +version = "0.3.2-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3968ad1160310296eb04f91a5f4edfa38fe1d6b2b8cd6b5c64e6f9b7370979e" +checksum = "e524d47a49fb4265611303339c4ef970d892817b006cc330dad18afb91e411b1" [[package]] name = "p3-mds" -version = "0.2.3-succinct" +version = "0.3.2-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2356b1ed0add6d5dfbf7a338ce534a6fde827374394a52cec16a0840af6e97c9" +checksum = "4f6cb8edcb276033d43769a3725570c340d2ed6f35c3cca4cddeee07718fa376" dependencies = [ "itertools 0.12.1", "p3-dft", @@ -3613,9 +4060,9 @@ dependencies = [ [[package]] name = "p3-poseidon2" -version = "0.2.3-succinct" +version = "0.3.2-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da1eec7e1b6900581bedd95e76e1ef4975608dd55be9872c9d257a8a9651c3a" +checksum = "5a26197df2097b98ab7038d59a01e1fe1a0f545e7e04aa9436b2454b1836654f" dependencies = [ "gcd", "p3-field", @@ -3627,9 +4074,9 @@ dependencies = [ [[package]] name = "p3-symmetric" -version = "0.2.3-succinct" +version = "0.3.2-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb439bea1d822623b41ff4b51e3309e80d13cadf8b86d16ffd5e6efb9fdc360" +checksum = "3a1d3b5202096bca57cde912fbbb9cbaedaf5ac7c42a924c7166b98709d64d21" dependencies = [ "itertools 0.12.1", "p3-field", @@ -3638,20 +4085,29 @@ dependencies = [ [[package]] name = "p3-util" -version = "0.2.3-succinct" +version = "0.3.2-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c2c2010678b9332b563eaa38364915b585c1a94b5ca61e2c7541c087ddda5c" +checksum = "ec5f0388aa6d935ca3a17444086120f393f0b2f0816010b5ff95998c1c4095e3" dependencies = [ "serde", ] +[[package]] +name = "pairing" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135590d8bdba2b31346f9cd1fb2a912329f5135e832a4f422942eb6ead8b6b3b" +dependencies = [ + "group 0.12.1", +] + [[package]] name = "pairing" version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f" dependencies = [ - "group", + "group 0.13.0", ] [[package]] @@ -3679,14 +4135,14 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "parking_lot" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ "lock_api", "parking_lot_core", @@ -3694,15 +4150,45 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.6", + "windows-link", +] + +[[package]] +name = "pasta_curves" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc65faf8e7313b4b1fbaa9f7ca917a0eed499a9663be71477f87993604341d8" +dependencies = [ + "blake2b_simd", + "ff 0.12.1", + "group 0.12.1", + "lazy_static", + "rand 0.8.5", + "static_assertions", + "subtle", +] + +[[package]] +name = "pasta_curves" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e57598f73cc7e1b2ac63c79c517b31a0877cd7c402cdcaa311b5208de7a095" +dependencies = [ + "blake2b_simd", + "ff 0.13.1", + "group 0.13.0", + "lazy_static", + "rand 0.8.5", + "static_assertions", + "subtle", ] [[package]] @@ -3717,20 +4203,42 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" +[[package]] +name = "pear" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdeeaa00ce488657faba8ebf44ab9361f9365a97bd39ffb8a60663f57ff4b467" +dependencies = [ + "inlinable_string", + "pear_codegen", + "yansi", +] + +[[package]] +name = "pear_codegen" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bab5b985dc082b345f812b7df84e1bef27e7207b39e448439ba8bd69c93f147" +dependencies = [ + "proc-macro2", + "proc-macro2-diagnostics", + "quote", + "syn 2.0.117", +] + [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.1" +version = "2.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323" +checksum = "e0848c601009d37dfa3430c4666e147e49cdcf1b92ecd3e63657d8a5f19da662" dependencies = [ "memchr", - "thiserror", "ucd-trie", ] @@ -3765,7 +4273,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -3779,29 +4287,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.10" +version = "1.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" +checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.10" +version = "1.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" +checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "pin-project-lite" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pin-utils" @@ -3819,12 +4327,6 @@ dependencies = [ "spki", ] -[[package]] -name = "pkg-config" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" - [[package]] name = "plain_hasher" version = "0.2.3" @@ -3864,15 +4366,15 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.11.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "potential_utf" -version = "0.1.2" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" dependencies = [ "zerovec", ] @@ -3892,6 +4394,16 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "prettyplease" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2", + "syn 2.0.117", +] + [[package]] name = "primeorder" version = "0.13.6" @@ -3914,11 +4426,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.3.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" +checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ - "toml_edit", + "toml_edit 0.25.11+spec-1.1.0", ] [[package]] @@ -3940,30 +4452,42 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] +[[package]] +name = "proc-macro2-diagnostics" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", + "version_check", + "yansi", +] + [[package]] name = "proptest" -version = "1.7.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f" +checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744" dependencies = [ "bit-set", "bit-vec", "bitflags", - "lazy_static", "num-traits", - "rand 0.9.1", + "rand 0.9.4", "rand_chacha 0.9.0", "rand_xorshift", "regex-syntax", @@ -3974,13 +4498,13 @@ dependencies = [ [[package]] name = "proptest-derive" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "095a99f75c69734802359b682be8daaf8980296731f6470434ea2c652af1dd30" +checksum = "fb6dc647500e84a25a85b100e76c85b8ace114c209432dc174f20aac11d4ed6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -4002,8 +4526,8 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.6.1", - "thiserror", + "socket2", + "thiserror 2.0.18", "tokio", "tracing", "web-time", @@ -4011,20 +4535,21 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.13" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" dependencies = [ + "aws-lc-rs", "bytes", - "getrandom 0.3.3", + "getrandom 0.3.4", "lru-slab", - "rand 0.9.1", + "rand 0.9.4", "ring", "rustc-hash", "rustls", "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.18", "tinyvec", "tracing", "web-time", @@ -4039,16 +4564,16 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.6.1", + "socket2", "tracing", "windows-sys 0.60.2", ] [[package]] name = "quote" -version = "1.0.40" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] @@ -4059,6 +4584,12 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + [[package]] name = "radium" version = "0.7.0" @@ -4079,12 +4610,12 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" +checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" dependencies = [ "rand_chacha 0.9.0", - "rand_core 0.9.3", + "rand_core 0.9.5", "serde", ] @@ -4105,7 +4636,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.3", + "rand_core 0.9.5", ] [[package]] @@ -4114,16 +4645,16 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", ] [[package]] name = "rand_core" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.3.4", "serde", ] @@ -4133,24 +4664,24 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" dependencies = [ - "rand_core 0.9.3", + "rand_core 0.9.5", ] [[package]] name = "rapidhash" -version = "4.1.1" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e65c75143ce5d47c55b510297eeb1182f3c739b6043c537670e9fc18612dae" +checksum = "b5e48930979c155e2f33aa36ab3119b5ee81332beb6482199a8ecd6029b80b59" dependencies = [ - "rand 0.9.1", + "rand 0.9.4", "rustversion", ] [[package]] name = "rayon" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" +checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" dependencies = [ "either", "rayon-core", @@ -4168,9 +4699,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.13" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ "bitflags", ] @@ -4181,36 +4712,36 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", "libredox", - "thiserror", + "thiserror 2.0.18", ] [[package]] name = "ref-cast" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.24" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "regex" -version = "1.11.1" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ "aho-corasick", "memchr", @@ -4220,9 +4751,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", @@ -4231,9 +4762,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "relative-path" @@ -4243,23 +4774,26 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "reqwest" -version = "0.12.20" +version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ "base64", "bytes", + "encoding_rs", "futures-core", + "futures-util", + "h2", "http", "http-body", "http-body-util", "hyper", "hyper-rustls", - "hyper-tls", "hyper-util", "js-sys", "log", - "native-tls", + "mime", + "mime_guess", "percent-encoding", "pin-project-lite", "quinn", @@ -4271,37 +4805,96 @@ dependencies = [ "serde_urlencoded", "sync_wrapper", "tokio", - "tokio-native-tls", "tokio-rustls", + "tokio-util", "tower", "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "webpki-roots", ] +[[package]] +name = "reqwest" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" +dependencies = [ + "base64", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "js-sys", + "log", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pki-types", + "rustls-platform-verifier", + "serde", + "serde_json", + "sync_wrapper", + "tokio", + "tokio-rustls", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "revm" version = "29.0.0" dependencies = [ - "revm-bytecode", - "revm-context", - "revm-context-interface", - "revm-database", - "revm-database-interface", - "revm-handler", - "revm-inspector", - "revm-interpreter", - "revm-precompile", - "revm-primitives", - "revm-state", + "revm-bytecode 6.2.2", + "revm-context 9.0.2", + "revm-context-interface 10.1.0", + "revm-database 7.0.5", + "revm-database-interface 7.0.5", + "revm-handler 10.0.0", + "revm-inspector 10.0.0", + "revm-interpreter 25.0.2", + "revm-precompile 27.0.0", + "revm-primitives 20.2.1", + "revm-state 7.0.5", "serde", "serde_json", ] +[[package]] +name = "revm" +version = "29.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "718d90dce5f07e115d0e66450b1b8aa29694c1cf3f89ebddaddccc2ccbd2f13e" +dependencies = [ + "revm-bytecode 6.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-context 9.1.0", + "revm-context-interface 10.2.0", + "revm-database 7.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-database-interface 7.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-handler 10.0.1", + "revm-inspector 10.0.1", + "revm-interpreter 25.0.3", + "revm-precompile 27.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-primitives 20.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-state 7.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "revm-bytecode" version = "6.2.2" @@ -4309,10 +4902,20 @@ dependencies = [ "bitvec", "paste", "phf", - "revm-primitives", + "revm-primitives 20.2.1", "serde", ] +[[package]] +name = "revm-bytecode" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66c52031b73cae95d84cd1b07725808b5fd1500da3e5e24574a3b2dc13d9f16d" +dependencies = [ + "bitvec", + "revm-primitives 20.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "revm-context" version = "9.0.2" @@ -4320,15 +4923,31 @@ dependencies = [ "bitvec", "cfg-if", "derive-where", - "revm-bytecode", - "revm-context-interface", - "revm-database", - "revm-database-interface", - "revm-primitives", - "revm-state", + "revm-bytecode 6.2.2", + "revm-context-interface 10.1.0", + "revm-database 7.0.5", + "revm-database-interface 7.0.5", + "revm-primitives 20.2.1", + "revm-state 7.0.5", "serde", ] +[[package]] +name = "revm-context" +version = "9.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a20c98e7008591a6f012550c2a00aa36cba8c14cc88eb88dec32eb9102554b4" +dependencies = [ + "bitvec", + "cfg-if", + "derive-where", + "revm-bytecode 6.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-context-interface 10.2.0", + "revm-database-interface 7.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-primitives 20.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-state 7.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "revm-context-interface" version = "10.1.0" @@ -4337,12 +4956,27 @@ dependencies = [ "alloy-eip7702", "auto_impl", "either", - "revm-database-interface", - "revm-primitives", - "revm-state", + "revm-database-interface 7.0.5", + "revm-primitives 20.2.1", + "revm-state 7.0.5", "serde", ] +[[package]] +name = "revm-context-interface" +version = "10.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b50d241ed1ce647b94caf174fcd0239b7651318b2c4c06b825b59b973dfb8495" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702", + "auto_impl", + "either", + "revm-database-interface 7.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-primitives 20.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-state 7.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "revm-database" version = "7.0.5" @@ -4350,27 +4984,51 @@ dependencies = [ "alloy-eips", "alloy-provider", "alloy-transport", - "revm-bytecode", - "revm-database-interface", - "revm-primitives", - "revm-state", + "revm-bytecode 6.2.2", + "revm-database-interface 7.0.5", + "revm-primitives 20.2.1", + "revm-state 7.0.5", "serde", "serde_json", "tokio", ] +[[package]] +name = "revm-database" +version = "7.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39a276ed142b4718dcf64bc9624f474373ed82ef20611025045c3fb23edbef9c" +dependencies = [ + "revm-bytecode 6.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-database-interface 7.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-primitives 20.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-state 7.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "revm-database-interface" version = "7.0.5" dependencies = [ "auto_impl", "either", - "revm-primitives", - "revm-state", + "revm-primitives 20.2.1", + "revm-state 7.0.5", "serde", "tokio", ] +[[package]] +name = "revm-database-interface" +version = "7.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c523c77e74eeedbac5d6f7c092e3851dbe9c7fec6f418b85992bd79229db361" +dependencies = [ + "auto_impl", + "either", + "revm-primitives 20.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-state 7.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "revm-ee-tests" version = "0.1.0" @@ -4378,7 +5036,7 @@ dependencies = [ "alloy-primitives", "alloy-sol-types", "op-revm", - "revm", + "revm 29.0.0", "rstest", "serde", "serde_json", @@ -4395,46 +5053,91 @@ dependencies = [ "alloy-signer-local", "auto_impl", "derive-where", - "revm-bytecode", - "revm-context", - "revm-context-interface", - "revm-database", - "revm-database-interface", - "revm-interpreter", - "revm-precompile", - "revm-primitives", - "revm-state", + "revm-bytecode 6.2.2", + "revm-context 9.0.2", + "revm-context-interface 10.1.0", + "revm-database 7.0.5", + "revm-database-interface 7.0.5", + "revm-interpreter 25.0.2", + "revm-precompile 27.0.0", + "revm-primitives 20.2.1", + "revm-state 7.0.5", "serde", ] +[[package]] +name = "revm-handler" +version = "10.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "550331ea85c1d257686e672081576172fe3d5a10526248b663bbf54f1bef226a" +dependencies = [ + "auto_impl", + "derive-where", + "revm-bytecode 6.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-context 9.1.0", + "revm-context-interface 10.2.0", + "revm-database-interface 7.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-interpreter 25.0.3", + "revm-precompile 27.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-primitives 20.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-state 7.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "revm-inspector" version = "10.0.0" dependencies = [ "auto_impl", "either", - "revm-context", - "revm-database", - "revm-database-interface", - "revm-handler", - "revm-interpreter", - "revm-primitives", - "revm-state", + "revm-context 9.0.2", + "revm-database 7.0.5", + "revm-database-interface 7.0.5", + "revm-handler 10.0.0", + "revm-interpreter 25.0.2", + "revm-primitives 20.2.1", + "revm-state 7.0.5", "serde", "serde_json", ] +[[package]] +name = "revm-inspector" +version = "10.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c0a6e9ccc2ae006f5bed8bd80cd6f8d3832cd55c5e861b9402fdd556098512f" +dependencies = [ + "auto_impl", + "either", + "revm-context 9.1.0", + "revm-database-interface 7.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-handler 10.0.1", + "revm-interpreter 25.0.3", + "revm-primitives 20.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-state 7.0.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "revm-interpreter" version = "25.0.2" dependencies = [ "bincode 2.0.1", - "revm-bytecode", - "revm-context-interface", - "revm-primitives", + "revm-bytecode 6.2.2", + "revm-context-interface 10.1.0", + "revm-primitives 20.2.1", "serde", ] +[[package]] +name = "revm-interpreter" +version = "25.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06575dc51b1d8f5091daa12a435733a90b4a132dca7ccee0666c7db3851bc30c" +dependencies = [ + "revm-bytecode 6.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-context-interface 10.2.0", + "revm-primitives 20.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "revm-precompile" version = "27.0.0" @@ -4455,16 +5158,37 @@ dependencies = [ "kzg-rs", "libsecp256k1", "p256", - "rand 0.9.1", - "revm-primitives", + "rand 0.9.4", + "revm-primitives 20.2.1", "ripemd", "rstest", "rug", - "secp256k1 0.31.0", + "secp256k1 0.31.1", "sha2 0.10.9", "substrate-bn", ] +[[package]] +name = "revm-precompile" +version = "27.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25b57d4bd9e6b5fe469da5452a8a137bc2d030a3cd47c46908efc615bbc699da" +dependencies = [ + "ark-bls12-381", + "ark-bn254", + "ark-ec", + "ark-ff 0.5.0", + "ark-serialize 0.5.0", + "arrayref", + "aurora-engine-modexp", + "cfg-if", + "k256", + "p256", + "revm-primitives 20.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ripemd", + "sha2 0.10.9", +] + [[package]] name = "revm-primitives" version = "20.2.1" @@ -4475,25 +5199,47 @@ dependencies = [ "serde", ] +[[package]] +name = "revm-primitives" +version = "20.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa29d9da06fe03b249b6419b33968ecdf92ad6428e2f012dc57bcd619b5d94e" +dependencies = [ + "alloy-primitives", + "num_enum", + "once_cell", +] + [[package]] name = "revm-state" version = "7.0.5" dependencies = [ "bitflags", - "revm-bytecode", - "revm-primitives", + "revm-bytecode 6.2.2", + "revm-primitives 20.2.1", "serde", ] +[[package]] +name = "revm-state" +version = "7.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f64fbacb86008394aaebd3454f9643b7d5a782bd251135e17c5b33da592d84d" +dependencies = [ + "bitflags", + "revm-bytecode 6.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "revm-primitives 20.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "revm-statetest-types" version = "9.0.2" dependencies = [ "k256", - "revm", + "revm 29.0.0", "serde", "serde_json", - "thiserror", + "thiserror 2.0.18", ] [[package]] @@ -4507,15 +5253,18 @@ dependencies = [ "alloy-serde", "alloy-sol-types", "anyhow", + "bincode 2.0.1", "derive-getters", "derive_more", "foundry-compilers", - "revm-context", - "revm-primitives", + "foundry-config", + "once_cell", + "revm-context 9.0.2", + "revm-primitives 20.2.1", "serde", "serde_json", - "thiserror", - "toml", + "thiserror 2.0.18", + "toml 0.9.12+spec-1.1.0", ] [[package]] @@ -4531,19 +5280,19 @@ dependencies = [ "indicatif", "k256", "plain_hasher", - "revm", - "revm-bytecode", - "revm-context", - "revm-context-interface", - "revm-database", - "revm-database-interface", - "revm-inspector", - "revm-primitives", - "revm-state", + "revm 29.0.0", + "revm-bytecode 6.2.2", + "revm-context 9.0.2", + "revm-context-interface 10.1.0", + "revm-database 7.0.5", + "revm-database-interface 7.0.5", + "revm-inspector 10.0.0", + "revm-primitives 20.2.1", + "revm-state 7.0.5", "revm-statetest-types", "serde", "serde_json", - "thiserror", + "thiserror 2.0.18", "triehash", "walkdir", ] @@ -4566,7 +5315,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.16", + "getrandom 0.2.17", "libc", "untrusted", "windows-sys 0.52.0", @@ -4617,15 +5366,15 @@ dependencies = [ "regex", "relative-path", "rustc_version 0.4.1", - "syn 2.0.103", + "syn 2.0.117", "unicode-ident", ] [[package]] name = "rug" -version = "1.27.0" +version = "1.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4207e8d668e5b8eb574bda8322088ccd0d7782d3d03c7e8d562e82ed82bdcbc3" +checksum = "25f6c8f906c90b48e0c1745c9f814c3a31c5eba847043b05c3e9a934dec7c4b3" dependencies = [ "az", "gmp-mpfr-sys", @@ -4635,14 +5384,15 @@ dependencies = [ [[package]] name = "ruint" -version = "1.16.0" +version = "1.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecb38f82477f20c5c3d62ef52d7c4e536e38ea9b73fb570a20c5cae0e14bcf6" +checksum = "c141e807189ad38a07276942c6623032d3753c8859c146104ac2e4d68865945a" dependencies = [ "alloy-rlp", "arbitrary", "ark-ff 0.3.0", "ark-ff 0.4.2", + "ark-ff 0.5.0", "bytes", "fastrlp 0.3.1", "fastrlp 0.4.0", @@ -4653,10 +5403,10 @@ dependencies = [ "primitive-types", "proptest", "rand 0.8.5", - "rand 0.9.1", + "rand 0.9.4", "rlp", "ruint-macro", - "serde", + "serde_core", "valuable", "zeroize", ] @@ -4669,9 +5419,9 @@ checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" [[package]] name = "rustc-hash" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" +checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" dependencies = [ "rand 0.8.5", ] @@ -4697,28 +5447,29 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.26", + "semver 1.0.28", ] [[package]] name = "rustix" -version = "1.0.7" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "rustls" -version = "0.23.35" +version = "0.23.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" +checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21" dependencies = [ + "aws-lc-rs", "once_cell", "ring", "rustls-pki-types", @@ -4733,28 +5484,56 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" dependencies = [ - "openssl-probe 0.2.1", + "openssl-probe", "rustls-pki-types", "schannel", - "security-framework 3.5.1", + "security-framework", ] [[package]] name = "rustls-pki-types" -version = "1.12.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" +checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" dependencies = [ "web-time", "zeroize", ] +[[package]] +name = "rustls-platform-verifier" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784" +dependencies = [ + "core-foundation 0.10.1", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki", + "security-framework", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" -version = "0.103.8" +version = "0.103.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" +checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06" dependencies = [ + "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -4762,15 +5541,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "rusty-fork" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2" dependencies = [ "fnv", "quick-error", @@ -4780,9 +5559,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "same-file" @@ -4793,13 +5572,22 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "sanitize-filename" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc984f4f9ceb736a7bb755c3e3bd17dc56370af2600c9780dcc48c66453da34d" +dependencies = [ + "regex", +] + [[package]] name = "schannel" -version = "0.1.27" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4814,6 +5602,18 @@ dependencies = [ "serde_json", ] +[[package]] +name = "schemars" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + [[package]] name = "scoped-tls" version = "1.0.1" @@ -4855,12 +5655,12 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3dff2d01c9aa65c3186a45ff846bfea52cbe6de3b6320ed2a358d90dad0d76" +checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2" dependencies = [ "bitcoin_hashes", - "rand 0.9.1", + "rand 0.9.4", "secp256k1-sys 0.11.0", ] @@ -4884,22 +5684,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags", - "core-foundation 0.9.4", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework" -version = "3.5.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" +checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ "bitflags", "core-foundation 0.10.1", @@ -4910,9 +5697,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.15.0" +version = "2.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" +checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" dependencies = [ "core-foundation-sys", "libc", @@ -4929,11 +5716,12 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" +checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" dependencies = [ "serde", + "serde_core", ] [[package]] @@ -4981,7 +5769,16 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", +] + +[[package]] +name = "serde_fmt" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e497af288b3b95d067a23a4f749f2861121ffcb2f6d8379310dcda040c345ed" +dependencies = [ + "serde_core", ] [[package]] @@ -4990,7 +5787,7 @@ version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ - "indexmap 2.12.1", + "indexmap 2.14.0", "itoa", "memchr", "serde", @@ -5000,9 +5797,18 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.0.4" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_spanned" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" +checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26" dependencies = [ "serde_core", ] @@ -5021,18 +5827,18 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.13.0" +version = "3.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf65a400f8f66fb7b0552869ad70157166676db75ed8181f8104ea91cf9d0b42" +checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f" dependencies = [ "base64", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.12.1", - "schemars", - "serde", - "serde_derive", + "indexmap 2.14.0", + "schemars 0.9.0", + "schemars 1.2.1", + "serde_core", "serde_json", "serde_with_macros", "time", @@ -5040,14 +5846,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.13.0" +version = "3.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81679d9ed988d5e9a5e6531dc3f2c28efbd639cbd1dfb628df08edea6004da77" +checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65" dependencies = [ - "darling 0.20.11", + "darling", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -5068,7 +5874,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.9.0", "opaque-debug", ] @@ -5080,7 +5886,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.10.7", "sha2-asm", ] @@ -5106,9 +5912,9 @@ dependencies = [ [[package]] name = "sha3-asm" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28efc5e327c837aa837c59eae585fc250715ef939ac32881bcc11677cd02d46" +checksum = "59cbb88c189d6352cc8ae96a39d19c7ecad8f7330b29461187f2587fdc2988d5" dependencies = [ "cc", "cfg-if", @@ -5120,6 +5926,16 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signal-hook-registry" +version = "1.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" +dependencies = [ + "errno", + "libc", +] + [[package]] name = "signature" version = "2.2.0" @@ -5132,49 +5948,121 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" +checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" [[package]] name = "siphasher" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" +checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" [[package]] name = "slab" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] -name = "smallvec" -version = "1.15.1" +name = "slop-algebra" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +checksum = "733912d564a68ff209707e71fdc517d4ff82d4362b6a409f6a8241dfcb7a576a" dependencies = [ + "itertools 0.14.0", + "p3-field", "serde", ] [[package]] -name = "socket2" -version = "0.5.10" +name = "slop-bn254" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +checksum = "a71b23ede427299e139fb822c5d0ea8fb931dc297eba0c6e2f30f774c04ebc81" dependencies = [ - "libc", - "windows-sys 0.52.0", + "ff 0.13.1", + "p3-bn254-fr", + "serde", + "slop-algebra", + "slop-challenger", + "slop-poseidon2", + "slop-symmetric", + "zkhash", ] [[package]] -name = "socket2" -version = "0.6.1" +name = "slop-challenger" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59e4993210936ab317c0d56ee8257e1cdfe6c2fae4df1e158737f034e21d45f9" +dependencies = [ + "futures", + "p3-challenger", + "serde", + "slop-algebra", + "slop-symmetric", +] + +[[package]] +name = "slop-koala-bear" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8986e94b9a43d58fc8ce5bf111b0985479ab888ced923e3052fb19943f7859b4" +dependencies = [ + "lazy_static", + "p3-koala-bear", + "serde", + "slop-algebra", + "slop-challenger", + "slop-poseidon2", + "slop-symmetric", +] + +[[package]] +name = "slop-poseidon2" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b06e4a24cba104a0a39740eedd97e60e8896926cc38e6a58d5866cc9811affa" +dependencies = [ + "p3-poseidon2", +] + +[[package]] +name = "slop-primitives" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b0b66701c82f6aab97f4990b5d9ed7463beb5b5042dbe5eda5f6c71a6207b35" +dependencies = [ + "slop-algebra", +] + +[[package]] +name = "slop-symmetric" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" +checksum = "e6d159948b924fd00f280064d7a049e43dceb2f26067f32fb99570d3169969ee" +dependencies = [ + "p3-symmetric", +] + +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -5187,7 +6075,7 @@ dependencies = [ "bumpalo", "either", "num-rational", - "semver 1.0.26", + "semver 1.0.28", "solar-data-structures", "solar-interface", "solar-macros", @@ -5228,7 +6116,7 @@ checksum = "2dea34e58332c7d6a8cde1f1740186d31682b7be46e098b8cc16fcb7ffd98bf5" dependencies = [ "bumpalo", "index_vec", - "indexmap 2.12.1", + "indexmap 2.14.0", "parking_lot", "rayon", "rustc-hash", @@ -5242,7 +6130,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d6163af2e773f4d455212fa9ba2c0664506029dd26232eb406f5046092ac311" dependencies = [ "annotate-snippets", - "anstream", + "anstream 0.6.21", "anstyle", "derive_more", "dunce", @@ -5258,7 +6146,7 @@ dependencies = [ "solar-config", "solar-data-structures", "solar-macros", - "thiserror", + "thiserror 2.0.18", "tracing", "unicode-width", ] @@ -5271,7 +6159,7 @@ checksum = "44a98045888d75d17f52e7b76f6098844b76078b5742a450c3ebcdbdb02da124" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -5323,11 +6211,42 @@ dependencies = [ "tracing", ] +[[package]] +name = "soldeer-core" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c6956940ce1436c00d50847e78c703375922d25130041a97f57508dee5f3952" +dependencies = [ + "bon", + "chrono", + "const-hex", + "derive_more", + "dunce", + "home", + "ignore", + "log", + "path-slash", + "rayon", + "regex", + "reqwest 0.12.28", + "sanitize-filename", + "semver 1.0.28", + "serde", + "serde_json", + "sha2 0.10.9", + "thiserror 2.0.18", + "tokio", + "toml_edit 0.23.10+spec-1.0.0", + "uuid", + "zip", + "zip-extract", +] + [[package]] name = "sp1-lib" -version = "5.0.5" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fd8bc101e5603ccf2dc1836ea06410f25ce2298755b2dac626add9be2424b4" +checksum = "9b96392c1b1c197beaa6b0806099a8d73643a09d5ac0874e26c9c5153a7fcb4c" dependencies = [ "bincode 1.3.3", "serde", @@ -5336,34 +6255,38 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "5.0.5" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "699935774a5131c1a8b371108d0666c0c80c43611045fb77fae43f2f242676d5" +checksum = "b6b77098dae9d62e080be3af253188c08e7e96e666423306654eede0110bf363" dependencies = [ "bincode 1.3.3", "blake3", - "cfg-if", + "elf", "hex", + "itertools 0.14.0", "lazy_static", "num-bigint 0.4.6", - "p3-baby-bear", - "p3-field", - "p3-poseidon2", - "p3-symmetric", "serde", "sha2 0.10.9", + "slop-algebra", + "slop-bn254", + "slop-challenger", + "slop-koala-bear", + "slop-poseidon2", + "slop-primitives", + "slop-symmetric", ] [[package]] name = "sp1_bls12_381" -version = "0.8.0-sp1-5.0.0" +version = "0.8.0-sp1-6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac255e1704ebcdeec5e02f6a0ebc4d2e9e6b802161938330b6810c13a610c583" +checksum = "f23e41cd36168cc2e51e5d3e35ff0c34b204d945769a65591a76286d04b51e43" dependencies = [ "cfg-if", - "ff", - "group", - "pairing", + "ff 0.13.1", + "group 0.13.0", + "pairing 0.23.0", "rand_core 0.6.4", "sp1-lib", "subtle", @@ -5387,9 +6310,9 @@ dependencies = [ [[package]] name = "stable_deref_trait" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "static_assertions" @@ -5405,24 +6328,23 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" dependencies = [ "heck", "proc-macro2", "quote", - "rustversion", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -5444,25 +6366,115 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +[[package]] +name = "sval" +version = "2.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb9318255ebd817902d7e279d8f8e39b35b1b9954decd5eb9ea0e30e5fd2b6a" + +[[package]] +name = "sval_buffer" +version = "2.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12571299185e653fdb0fbfe36cd7f6529d39d4e747a60b15a3f34574b7b97c61" +dependencies = [ + "sval", + "sval_ref", +] + +[[package]] +name = "sval_dynamic" +version = "2.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39526f24e997706c0de7f03fb7371f7f5638b66a504ded508e20ad173d0a3677" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_fmt" +version = "2.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "933dd3bb26965d682280fcc49400ac2a05036f4ee1e6dbd61bf8402d5a5c3a54" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_json" +version = "2.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0cda08f6d5c9948024a6551077557b1fdcc3880ff2f20ae839667d2ec2d87ed" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_nested" +version = "2.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d49d5e6c1f9fd0e53515819b03a97ca4eb1bff5c8ee097c43391c09ecfb19f" +dependencies = [ + "sval", + "sval_buffer", + "sval_ref", +] + +[[package]] +name = "sval_ref" +version = "2.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f876c5a78405375b4e19cbb9554407513b59c93dea12dc6a4af4e1d30899ca" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_serde" +version = "2.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f9ccd3b7f7200239a655e517dd3fd48d960b9111ad24bd6a5e055bef17607c7" +dependencies = [ + "serde_core", + "sval", + "sval_nested", +] + [[package]] name = "svm-rs" -version = "0.5.23" +version = "0.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415b159b54c22d9810087f0991371fd6242a912673e982a7c4ca8ea122f7e00a" +checksum = "230df06b463c7251e4d1b39b1b3e6f25a9b3a42630179053a1e5f919e6e15534" dependencies = [ "const-hex", "dirs", - "reqwest", - "semver 1.0.26", + "reqwest 0.13.2", + "semver 1.0.28", "serde", "serde_json", "sha2 0.10.9", "tempfile", - "thiserror", + "thiserror 2.0.18", "url", "zip", ] +[[package]] +name = "svm-rs-builds" +version = "0.5.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b271921143e5b12947a526de464db02b00363919d582a7ea712374840f928328" +dependencies = [ + "const-hex", + "semver 1.0.28", + "serde_json", + "svm-rs", +] + [[package]] name = "syn" version = "1.0.109" @@ -5476,9 +6488,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.103" +version = "2.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8" +checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" dependencies = [ "proc-macro2", "quote", @@ -5487,14 +6499,14 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "1.5.1" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b1d2e2059056b66fec4a6bb2b79511d5e8d76196ef49c38996f4b48db7662f" +checksum = "53f425ae0b12e2f5ae65542e00898d500d4d318b4baf09f40fd0d410454e9947" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -5514,7 +6526,28 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", +] + +[[package]] +name = "system-configuration" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" +dependencies = [ + "bitflags", + "core-foundation 0.9.4", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", ] [[package]] @@ -5525,35 +6558,55 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.20.0" +version = "3.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" +checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.3.3", + "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "thiserror" -version = "2.0.17" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" +dependencies = [ + "thiserror-impl 2.0.18", ] [[package]] name = "thiserror-impl" -version = "2.0.17" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", ] [[package]] @@ -5576,49 +6629,40 @@ dependencies = [ [[package]] name = "time" -version = "0.3.41" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" +checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" dependencies = [ "deranged", "itoa", "num-conv", "powerfmt", - "serde", + "serde_core", "time-core", "time-macros", ] [[package]] name = "time-core" -version = "0.1.4" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" +checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" [[package]] name = "time-macros" -version = "0.2.22" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" +checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" dependencies = [ "num-conv", "time-core", ] -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tinystr" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" dependencies = [ "displaydoc", "zerovec", @@ -5636,9 +6680,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" dependencies = [ "tinyvec_macros", ] @@ -5651,38 +6695,29 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.48.0" +version = "1.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +checksum = "f66bf9585cda4b724d3e78ab34b73fb2bbaba9011b9bfdf69dc836382ea13b8c" dependencies = [ "bytes", "libc", "mio", "pin-project-lite", - "socket2 0.6.1", + "signal-hook-registry", + "socket2", "tokio-macros", "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" +checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", + "syn 2.0.117", ] [[package]] @@ -5697,9 +6732,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" +checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" dependencies = [ "futures-core", "pin-project-lite", @@ -5709,9 +6744,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.15" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" dependencies = [ "bytes", "futures-core", @@ -5722,17 +6757,29 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.11+spec-1.1.0" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" +checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" dependencies = [ - "indexmap 2.12.1", + "serde", + "serde_spanned 0.6.9", + "toml_datetime 0.6.11", + "toml_edit 0.22.27", +] + +[[package]] +name = "toml" +version = "0.9.12+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863" +dependencies = [ + "indexmap 2.14.0", "serde_core", - "serde_spanned", + "serde_spanned 1.1.1", "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "toml_writer", - "winnow", + "winnow 0.7.15", ] [[package]] @@ -5740,6 +6787,9 @@ name = "toml_datetime" version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c" +dependencies = [ + "serde", +] [[package]] name = "toml_datetime" @@ -5750,37 +6800,82 @@ dependencies = [ "serde_core", ] +[[package]] +name = "toml_datetime" +version = "1.1.1+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" +dependencies = [ + "serde_core", +] + [[package]] name = "toml_edit" version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.12.1", + "indexmap 2.14.0", + "serde", + "serde_spanned 0.6.9", "toml_datetime 0.6.11", - "winnow", + "toml_write", + "winnow 0.7.15", +] + +[[package]] +name = "toml_edit" +version = "0.23.10+spec-1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" +dependencies = [ + "indexmap 2.14.0", + "serde_core", + "serde_spanned 1.1.1", + "toml_datetime 0.7.5+spec-1.1.0", + "toml_parser", + "toml_writer", + "winnow 0.7.15", +] + +[[package]] +name = "toml_edit" +version = "0.25.11+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b" +dependencies = [ + "indexmap 2.14.0", + "toml_datetime 1.1.1+spec-1.1.0", + "toml_parser", + "winnow 1.0.1", ] [[package]] name = "toml_parser" -version = "1.0.6+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" +checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ - "winnow", + "winnow 1.0.1", ] +[[package]] +name = "toml_write" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" + [[package]] name = "toml_writer" -version = "1.0.6+spec-1.1.0" +version = "1.1.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" +checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db" [[package]] name = "tower" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" dependencies = [ "futures-core", "futures-util", @@ -5793,9 +6888,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ "bitflags", "bytes", @@ -5823,9 +6918,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.41" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -5834,20 +6929,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.103", + "syn 2.0.117", ] [[package]] name = "tracing-core" -version = "0.1.34" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", "valuable", @@ -5878,11 +6973,17 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +[[package]] +name = "typeid" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" + [[package]] name = "typenum" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "ucd-trie" @@ -5908,23 +7009,38 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" +[[package]] +name = "uncased" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicase" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" + [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-segmentation" -version = "1.12.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" +checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c" [[package]] name = "unicode-width" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" [[package]] name = "unicode-xid" @@ -5946,13 +7062,15 @@ checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" [[package]] name = "url" -version = "2.5.4" +version = "2.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", + "serde_derive", ] [[package]] @@ -5969,12 +7087,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.19.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" +checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9" dependencies = [ - "getrandom 0.3.3", + "getrandom 0.4.2", "js-sys", + "serde_core", "wasm-bindgen", ] @@ -5985,10 +7104,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] -name = "vcpkg" -version = "0.2.15" +name = "value-bag" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba6f5989077681266825251a52748b8c1d8a4ad098cc37e440103d0ea717fc0" +dependencies = [ + "value-bag-serde1", + "value-bag-sval2", +] + +[[package]] +name = "value-bag-serde1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +checksum = "16530907bfe2999a1773ca5900a65101e092c70f642f25cc23ca0c43573262c5" +dependencies = [ + "erased-serde", + "serde_core", + "serde_fmt", +] + +[[package]] +name = "value-bag-sval2" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d00ae130edd690eaa877e4f40605d534790d1cf1d651e7685bd6a144521b251f" +dependencies = [ + "sval", + "sval_buffer", + "sval_dynamic", + "sval_fmt", + "sval_json", + "sval_ref", + "sval_serde", +] [[package]] name = "version_check" @@ -6037,58 +7186,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" +name = "wasip2" +version = "1.0.2+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" dependencies = [ - "wit-bindgen-rt", + "wit-bindgen", ] [[package]] -name = "wasm-bindgen" -version = "0.2.100" +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" dependencies = [ - "cfg-if", - "once_cell", - "rustversion", - "wasm-bindgen-macro", + "wit-bindgen", ] [[package]] -name = "wasm-bindgen-backend" -version = "0.2.100" +name = "wasm-bindgen" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +checksum = "0bf938a0bacb0469e83c1e148908bd7d5a6010354cf4fb73279b7447422e3a89" dependencies = [ - "bumpalo", - "log", - "proc-macro2", - "quote", - "syn 2.0.103", + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.50" +version = "0.4.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" +checksum = "f371d383f2fb139252e0bfac3b81b265689bf45b6874af544ffa4c975ac1ebf8" dependencies = [ - "cfg-if", "js-sys", - "once_cell", "wasm-bindgen", - "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.100" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +checksum = "eeff24f84126c0ec2db7a449f0c2ec963c6a49efe0698c4242929da037ca28ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6096,31 +7238,78 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.100" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +checksum = "9d08065faf983b2b80a79fd87d8254c409281cf7de75fc4b773019824196c904" dependencies = [ + "bumpalo", "proc-macro2", "quote", - "syn 2.0.103", - "wasm-bindgen-backend", + "syn 2.0.117", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.100" +version = "0.2.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +checksum = "5fd04d9e306f1907bd13c6361b5c6bfc7b3b3c095ed3f8a9246390f8dbdee129" dependencies = [ "unicode-ident", ] [[package]] -name = "wasmtimer" +name = "wasm-encoder" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" +dependencies = [ + "leb128fmt", + "wasmparser", +] + +[[package]] +name = "wasm-metadata" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" +dependencies = [ + "anyhow", + "indexmap 2.14.0", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasm-streams" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8d49b5d6c64e8558d9b1b065014426f35c18de636895d24893dbbd329743446" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags", + "hashbrown 0.15.5", + "indexmap 2.14.0", + "semver 1.0.28", +] + +[[package]] +name = "wasmtimer" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c598d6b99ea013e35844697fc4670d08339d5cda15588f193c6beedd12f644b" dependencies = [ "futures", "js-sys", @@ -6132,9 +7321,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.77" +version = "0.3.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +checksum = "4f2dfbb17949fa2088e5d39408c48368947b86f7834484e87b73de55bc14d97d" dependencies = [ "js-sys", "wasm-bindgen", @@ -6150,87 +7339,110 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-root-certs" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804f18a4ac2676ffb4e8b5b5fa9ae38af06df08162314f96a68d2a363e21a8ca" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webpki-roots" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" +checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed" dependencies = [ "rustls-pki-types", ] [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "windows-core" -version = "0.61.2" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement", "windows-interface", - "windows-link 0.1.3", + "windows-link", "windows-result", "windows-strings", ] [[package]] name = "windows-implement" -version = "0.60.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "windows-interface" -version = "0.59.1" +version = "0.59.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "windows-link" -version = "0.1.3" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] -name = "windows-link" -version = "0.2.1" +name = "windows-registry" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" +dependencies = [ + "windows-link", + "windows-result", + "windows-strings", +] [[package]] name = "windows-result" -version = "0.3.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link 0.1.3", + "windows-link", ] [[package]] name = "windows-strings" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link 0.1.3", + "windows-link", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", ] [[package]] @@ -6266,7 +7478,22 @@ 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]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -6291,7 +7518,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", @@ -6302,6 +7529,12 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -6314,6 +7547,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" @@ -6326,6 +7565,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -6350,6 +7595,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.52.6" @@ -6362,6 +7613,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -6374,6 +7631,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" @@ -6386,6 +7649,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -6400,27 +7669,115 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" +checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" dependencies = [ "memchr", ] [[package]] -name = "wit-bindgen-rt" -version = "0.39.0" +name = "winnow" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" dependencies = [ + "memchr", +] + +[[package]] +name = "wit-bindgen" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +dependencies = [ + "wit-bindgen-rust-macro", +] + +[[package]] +name = "wit-bindgen-core" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" +dependencies = [ + "anyhow", + "heck", + "wit-parser", +] + +[[package]] +name = "wit-bindgen-rust" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck", + "indexmap 2.14.0", + "prettyplease", + "syn 2.0.117", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2", + "quote", + "syn 2.0.117", + "wit-bindgen-core", + "wit-bindgen-rust", +] + +[[package]] +name = "wit-component" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +dependencies = [ + "anyhow", "bitflags", + "indexmap 2.14.0", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.14.0", + "log", + "semver 1.0.28", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", ] [[package]] name = "writeable" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" +checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" [[package]] name = "wyz" @@ -6442,14 +7799,16 @@ name = "yansi" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" +dependencies = [ + "is-terminal", +] [[package]] name = "yoke" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" dependencies = [ - "serde", "stable_deref_trait", "yoke-derive", "zerofrom", @@ -6457,82 +7816,82 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", "synstructure", ] [[package]] name = "zerocopy" -version = "0.8.26" +version = "0.8.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.26" +version = "0.8.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "zerofrom" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", "synstructure", ] [[package]] name = "zeroize" -version = "1.8.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] name = "zerotrie" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" dependencies = [ "displaydoc", "yoke", @@ -6541,9 +7900,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" +checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" dependencies = [ "yoke", "zerofrom", @@ -6552,13 +7911,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" dependencies = [ "proc-macro2", "quote", - "syn 2.0.103", + "syn 2.0.117", ] [[package]] @@ -6570,31 +7929,74 @@ dependencies = [ "arbitrary", "crc32fast", "flate2", - "indexmap 2.12.1", + "indexmap 2.14.0", "memchr", "zopfli", ] +[[package]] +name = "zip-extract" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fa5b9958fd0b5b685af54f2c3fa21fca05fe295ebaf3e77b6d24d96c4174037" +dependencies = [ + "log", + "thiserror 2.0.18", + "zip", +] + +[[package]] +name = "zkhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4352d1081da6922701401cdd4cbf29a2723feb4cfabb5771f6fee8e9276da1c7" +dependencies = [ + "ark-ff 0.4.2", + "ark-std 0.4.0", + "bitvec", + "blake2", + "bls12_381", + "byteorder", + "cfg-if", + "group 0.12.1", + "group 0.13.0", + "halo2", + "hex", + "jubjub", + "lazy_static", + "pasta_curves 0.5.1", + "rand 0.8.5", + "serde", + "sha2 0.10.9", + "sha3", + "subtle", +] + [[package]] name = "zlib-rs" -version = "0.5.5" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40990edd51aae2c2b6907af74ffb635029d5788228222c4bb811e9351c0caad3" +checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513" [[package]] name = "zmij" -version = "1.0.17" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02aae0f83f69aafc94776e879363e9771d7ecbffe2c7fbb6c14c5e00dfe88439" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" [[package]] name = "zopfli" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7" +checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249" dependencies = [ "bumpalo", "crc32fast", "log", "simd-adler32", ] + +[[patch.unused]] +name = "gmp-mpfr-sys" +version = "1.6.8" +source = "git+ssh://git@github.com/Entropy-Foundation/gmp-mpfr-sys?branch=master#6d5c91968d809b692df0abdcc3d93ce3588ff7ad" diff --git a/Cargo.toml b/Cargo.toml index efa6ca54b4..d60a06241d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -81,11 +81,12 @@ alloy = { version = "1.0.19", features = ["sol-types", "contract"] } alloy-serde = { version = "1.0.19" } # libraries required to build supra-contract bindings -# For more detaisl see crates/supra-extension/build.rs +# For more details see crates/supra-extension/build.rs #forge = { git = "https://github.com/foundry-rs/foundry.git", tag="v1.4.1"} #alloy-chains = { version = "0.2.13" } #shlex = { version = "1.3.0" } foundry-compilers = "0.19.14" +foundry-config = { git = "https://github.com/foundry-rs/foundry.git", tag="v1.4.1"} toml = { version = "0.9.8"} # precompiles diff --git a/crates/handler/src/handler.rs b/crates/handler/src/handler.rs index 09f0c1eb5e..7b01935165 100644 --- a/crates/handler/src/handler.rs +++ b/crates/handler/src/handler.rs @@ -14,6 +14,8 @@ use interpreter::interpreter_action::FrameInit; use interpreter::{Gas, InitialAndFloorGas, SharedMemory}; use primitives::supra_constants::{is_supra_reserved, is_vm_signer}; use primitives::U256; +use std::format; +use std::string::String; /// Trait for errors that can occur during EVM execution. /// diff --git a/crates/supra-extension/Cargo.toml b/crates/supra-extension/Cargo.toml index 254c2b5133..05659954a3 100644 --- a/crates/supra-extension/Cargo.toml +++ b/crates/supra-extension/Cargo.toml @@ -39,6 +39,7 @@ workspace = true #clap = { workspace = true } #shlex = { workspace = true } foundry-compilers = { workspace = true } +foundry-config = { workspace = true } anyhow = { workspace = true } toml = { workspace = true } serde = {workspace = true } diff --git a/crates/supra-extension/build.rs b/crates/supra-extension/build.rs index 3c4eed76da..5a6b8f60ed 100644 --- a/crates/supra-extension/build.rs +++ b/crates/supra-extension/build.rs @@ -2,14 +2,14 @@ use anyhow::Result; use bincode; -use foundry_compilers::artifacts::Remapping; -use foundry_compilers::multi::MultiCompilerSettings; -use foundry_compilers::solc::SolcSettings; -use foundry_compilers::{utils, Project, ProjectPathsConfig}; +use foundry_compilers::utils; +use foundry_config::Config; use serde::{Deserialize, Serialize}; +use std::collections::BTreeMap; use std::env; use std::path::Path; use std::path::PathBuf; +use std::process::Command; const CURRENT_DIR: &str = env!("CARGO_MANIFEST_DIR"); @@ -58,10 +58,14 @@ fn rebuild_rust_bindings() { #[derive(Serialize, Deserialize, Debug)] struct CompileConfig { - dapp_relative_path: PathBuf, - solc_settings: SolcSettings, - #[serde(default)] - remappings: Vec<(String, String)>, + /// Supra contracts relative path + supra_dapp_path: PathBuf, + /// Supra nova dapp repository + supra_nova_repo: String, + /// Supra nova dapp tag to reference to + supra_nova_tag: String, + /// Supra nova dapp relative path in repo + supra_nova_dapp_path: String, } impl CompileConfig { @@ -72,45 +76,70 @@ impl CompileConfig { .inspect_err(|e| println!("Error: {}", e)) } - fn dapp_path(&self) -> PathBuf { - utils::canonicalize(Path::new(CURRENT_DIR).join(&self.dapp_relative_path)) + fn supra_contracts_dapp_path(&self) -> PathBuf { + utils::canonicalize(Path::new(CURRENT_DIR).join(&self.supra_dapp_path)) .expect("failed to canonicalize dapp path") } - fn remappings(&self) -> Vec { - self.remappings - .iter() - .map(|(name, rel_path)| Remapping { - context: None, - name: name.clone(), - path: self - .dapp_path() - .join(rel_path) - .to_string_lossy() - .into_owned(), - }) - .collect() + fn supra_nova_dapp_path(&self) -> Result { + self.checkout_supra_nova_repo() + .map(|path| path.join(self.supra_nova_dapp_path.clone())) } - fn to_multi_compiler_settings(self) -> MultiCompilerSettings { - let mut settings = MultiCompilerSettings::default(); - settings.solc = self.solc_settings; - settings - } -} + fn checkout_supra_nova_repo(&self) -> Result { + let out_dir = env::var("OUT_DIR")?; + let repo_dir = Path::new(&out_dir).join("supranova-contracts"); + + if repo_dir.exists() { + // Check whether the already-cloned repo is at the right tag. + let output = Command::new("git") + .args(["describe", "--tags", "--exact-match"]) + .current_dir(&repo_dir) + .output()?; + let current_tag = String::from_utf8_lossy(&output.stdout).trim().to_string(); + if current_tag == self.supra_nova_tag { + return Ok(repo_dir); + } + // Wrong tag – remove and re-clone. + std::fs::remove_dir_all(&repo_dir)?; + } + + let status = Command::new("git") + .env( + "GIT_SSH_COMMAND", + "ssh -o BatchMode=yes -o StrictHostKeyChecking=no", + ) + .args([ + "clone", + "--recurse-submodules", + "--branch", + self.supra_nova_tag.as_str(), + "--depth", + "1", + self.supra_nova_repo.as_str(), + repo_dir + .to_str() + .ok_or_else(|| anyhow::anyhow!("non-UTF-8 OUT_DIR path"))?, + ]) + .status()?; -fn compile_contracts() -> Result { - let config = CompileConfig::load()?; + if !status.success() { + return Err(anyhow::anyhow!( + "Failed to clone {} at tag {}", + self.supra_nova_repo, + self.supra_nova_tag + )); + } - let mut paths = ProjectPathsConfig::dapptools(&config.dapp_path())?; - for (idx, value) in config.remappings().into_iter().enumerate() { - paths.remappings.insert(idx, value) + Ok(repo_dir) } +} + +fn compile_contracts(path: &impl AsRef) -> Result { + let foundry_config = Config::load_with_root(path.as_ref())?.sanitized(); + let _ = foundry_config.install_lib_dir(); + let project = foundry_config.project()?; - let project = Project::builder() - .paths(paths) - .settings(config.to_multi_compiler_settings()) - .build(Default::default())?; let output = project.compile()?; let _ = output.succeeded(); // Tell Cargo that if a source file changes, to rerun this build script. @@ -126,24 +155,59 @@ fn compile_contracts() -> Result { Ok(artifacts_dir) } -fn combine_and_dump_contracts_bytecode(artifacts_path: &Path) -> Result<()> { +fn load_supra_contracts_bytecode( + artifacts_path: &Path, + bytecodes: &mut BTreeMap>, +) -> Result<()> { // Contract names to load - let contract_names = vec![ + let contract_names = [ "MultiSignatureWallet", "MultisigBeacon", "BeaconProxy", "ERC20Supra", + "ERC20SupraHandler", "BlockMeta", "ERC1967Proxy", - "AutomationCore", - "AutomationRegistry", - "AutomationController", + "DiamondCutFacet", + "Diamond", + "DiamondLoupeFacet", + "OwnershipFacet", + "ConfigFacet", + "RegistryFacet", + "CoreFacet", + "DiamondInit", ]; + load_contracts_bytecode(&contract_names, artifacts_path, bytecodes) +} - let mut bytecodes = std::collections::BTreeMap::new(); +fn load_supra_nova_contracts_bytecode( + artifacts_path: &Path, + bytecodes: &mut BTreeMap>, +) -> Result<()> { + // Contract names to load + let contract_names = [ + "WrappedToken", // Impl + "WrappedTokenFactory", // Beacon + "WrappedTokenFactoryProxy", // Beacon Proxy + "TokenVault", + "TokenVaultProxy", + "Hypernova", + "HypernovaProxy", + "FeeOperator", + "FeeOperatorProxy", + "TokenBridge", + "TokenBridgeProxy", + ]; + load_contracts_bytecode(&contract_names, artifacts_path, bytecodes) +} +fn load_contracts_bytecode( + contract_names: &[&'static str], + artifacts_path: &Path, + bytecodes: &mut BTreeMap>, +) -> Result<()> { // Load each contract's bytecode - for contract_name in &contract_names { + for contract_name in contract_names { let path = artifacts_path .join(format!("{contract_name}.sol")) .join(format!("{contract_name}.json")); @@ -169,12 +233,22 @@ fn combine_and_dump_contracts_bytecode(artifacts_path: &Path) -> Result<()> { anyhow::anyhow!("Failed to load bytecode for contract: {contract_name}") })?; - bytecodes.insert(contract_name.to_string(), bytecode); + let inserted = bytecodes.insert(contract_name.to_string(), bytecode); + if inserted.is_some() { + return Err(anyhow::anyhow!( + "Duplicate contract name: {contract_name} in {artifacts_path:?} path" + )); + } } + Ok(()) +} +fn dump_bytecodes(bytecodes: BTreeMap>, bin_file_name: &str) -> Result<()> { // Dump the combined contract bytecodes to be loaded at compile to by generator. let out_dir = env::var("OUT_DIR")?; - let out_path = Path::new(&out_dir).join("contract_bytecodes.bin"); + let out_path = Path::new(&out_dir) + .join(bin_file_name) + .with_extension("bin"); std::fs::write( &out_path, @@ -183,17 +257,27 @@ fn combine_and_dump_contracts_bytecode(artifacts_path: &Path) -> Result<()> { ) .expect("Failed to write bytecodes to file"); - println!("cargo:rustc-env=CONTRACTS_LOADED=1"); + println!("cargo:rustc-env=CONTRACTS_DUMPED=1"); Ok(()) } fn main() { rebuild_rust_bindings(); - let artifacts_dir = compile_contracts() - .inspect_err(|e| panic!("{e:?}")) - .unwrap(); - combine_and_dump_contracts_bytecode(&artifacts_dir) - .inspect_err(|e| panic!("Failed to combine and dump contract bytecodes: {e:?}")) - .unwrap() + let config = CompileConfig::load().expect("Config should always be valid"); + let supra_contracts_artifacts = compile_contracts(&config.supra_contracts_dapp_path()) + .expect("Successful supra contracts compilation"); + let supra_nova_artifacts = compile_contracts( + &config + .supra_nova_dapp_path() + .expect("Successful supra nova dapp path resolve"), + ) + .expect("Successful supra nova contracts compilation"); + let mut contracts_bytecode = BTreeMap::new(); + load_supra_contracts_bytecode(&supra_contracts_artifacts, &mut contracts_bytecode) + .expect("Supra contracts loaded successfully"); + load_supra_nova_contracts_bytecode(&supra_nova_artifacts, &mut contracts_bytecode) + .expect("Supra nova contracts loaded successfully"); + dump_bytecodes(contracts_bytecode, "supra_contracts_bytecode") + .expect("Bytecodes dumped successfully"); } diff --git a/crates/supra-extension/compile_config.toml b/crates/supra-extension/compile_config.toml index e43581cc69..d44c795ac1 100644 --- a/crates/supra-extension/compile_config.toml +++ b/crates/supra-extension/compile_config.toml @@ -1,14 +1,7 @@ -dapp_relative_path = "../../solidity/supra_contracts/" -remappings = [["@openzeppelin/contracts/", "lib/openzeppelin-contracts/contracts/"]] +supra_dapp_path = "../../solidity/supra_contracts/" -[solc_settings] -evmVersion = "prague" -viaIR = true +supra_nova_repo = "git@github.com:Entropy-Foundation/supranova-contracts-private.git" +supra_nova_tag = "supranova-evm-v2.0.0-beta.1" +supra_nova_dapp_path = "hypernova/evm" -[solc_settings.optimizer] -enabled = true -runs = 200 -[solc_settings.outputSelection."*"] -"" = ["ast"] -"*" = ["abi", "evm.bytecode.object"] diff --git a/crates/supra-extension/src/contracts/configs.rs b/crates/supra-extension/src/contracts/configs.rs index 58f6a4f5a6..04a3099d69 100644 --- a/crates/supra-extension/src/contracts/configs.rs +++ b/crates/supra-extension/src/contracts/configs.rs @@ -1,9 +1,10 @@ //! Configurations to generate genesis transactions -use primitives::Address; +use serde::{Deserialize, Serialize}; +use primitives::{address, Address}; /// Configuration parameters for Automation Registry contracts initialization -#[derive(Debug, Clone)] +#[derive(Debug, Clone, Serialize, Deserialize)] pub struct AutomationRegistryConfigV1 { /// Maximum allowable duration (in seconds) from the registration time that a user automation task can run. pub task_duration_cap_secs: u64, @@ -59,7 +60,7 @@ impl Default for AutomationRegistryConfigV1 { } /// Configuration parameters for Automation Registry contracts initialization -#[derive(Debug, Clone)] +#[derive(Debug, Clone, Serialize, Deserialize)] pub enum AutomationRegistryConfig { /// First version of the evm automation registry contract configurations V1(AutomationRegistryConfigV1), @@ -79,8 +80,62 @@ impl From for AutomationRegistryConfig { } } +/// Configuration to generate supra-nova contracts for genesis +#[derive(Debug, Clone, Serialize, Deserialize)] +pub struct SupraNovaConfig { + /// Dora storage addressed utilized by fee operator. + pub dora_storage_address: Address, + /// WETH9 address utilized by token vault and token bridge. + pub weth9_address: Address, + /// Hypernova message index. + pub hypernova_msg_id: u64, + /// USDT pair index in Dora. + pub supra_usdt_pair_idx: u64, + /// Maximum stale oracle price limit. + pub max_stale_oracle_price_limit: u64, +} + +impl Default for SupraNovaConfig { + fn default() -> Self { + Self { + dora_storage_address: Self::DORA_STORAGE_TESTNET, + weth9_address: Self::WETH9_TESTNET, + hypernova_msg_id: 0, + supra_usdt_pair_idx: Self::SUPRA_USDT_PAIR_INDEX, + max_stale_oracle_price_limit: Self::MAX_STALE_ORACLE_PRICE_LIMIT, + } + } +} + + +impl SupraNovaConfig { + pub(crate) const WRAPPED_TOKEN_IMPL_SALT: &'static str = "supranova.WrappedToken.v1"; + pub(crate) const WRAPPED_TOKEN_FACTORY_IMPL_SALT:&'static str = "supranova.WrappedTokenFactory.v1"; + pub(crate) const WRAPPED_TOKEN_FACTORY_PROXY_SALT: &'static str = "supranova.WrappedTokenFactoryProxy.v1"; + + pub(crate) const HYPER_NOVA_IMPL_SALT: &'static str = "supranova.Hypernova.v2"; + pub(crate) const HYPER_NOVA_PROXY_SALT: &'static str = "supranova.HypernovaProxy.v2"; + + pub(crate) const FEE_OPERATOR_IMPL_SALT: &'static str = "supranova.FeeOperator.v2"; + pub(crate) const FEE_OPERATOR_PROXY_SALT: &'static str = "supranova.FeeOperatorProxy.v2"; + + pub(crate) const DORA_STORAGE_TESTNET: Address = address!("0x131918bC49Bb7de74aC7e19d61A01544242dAA80"); + pub(crate) const SUPRA_USDT_PAIR_INDEX: u64 = 500; + pub(crate) const MAX_STALE_ORACLE_PRICE_LIMIT:u64 = 86400; + + pub(crate) const TOKEN_BRIDGE_IMPL_SALT: &'static str = "supranova.TokenBridge.v2"; + pub(crate) const TOKEN_BRIDGE_PROXY_SALT: &'static str = "supranova.TokenBridgeProxy.v2"; + + pub(crate) const WETH9_TESTNET: Address = address!("0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14"); + + + pub(crate) const TOKEN_VAULT_IMPL_SALT: &'static str = "supranova.TokenVault.v2"; + pub(crate) const TOKEN_VAULT_PROXY_SALT: &'static str = "supranova.TokenVaultProxy.v2"; + +} + /// Genesis Transaction generator configuration details -#[derive(Debug, Clone)] +#[derive(Debug, Clone, Serialize, Deserialize)] pub struct GenesisTransactionGeneratorConfig { /// List of EOAs to set up multisig foundation wallet. pub foundation_owners: Vec
, @@ -90,4 +145,8 @@ pub struct GenesisTransactionGeneratorConfig { pub full_set: bool, /// Automation configuration parameters (optional, uses defaults if None). pub automation_config: Option, + /// Initial native tokens to be minted to ERC20Supra handler contract + pub initial_native_token: u128, + /// Indicates whether the genesis transactions are generated for localnet. + pub supra_nova_config: Option, } diff --git a/crates/supra-extension/src/contracts/generator.rs b/crates/supra-extension/src/contracts/generator.rs index 9357384eda..d927a06f8e 100644 --- a/crates/supra-extension/src/contracts/generator.rs +++ b/crates/supra-extension/src/contracts/generator.rs @@ -1,19 +1,30 @@ //! Encloses transaction data generation logic based on the genesis contracts -use crate::contracts::configs::{AutomationRegistryConfig, GenesisTransactionGeneratorConfig}; -use crate::contracts::transaction::{GenesisTransaction, GenesisTransactionTags}; +use crate::contracts::configs::{ + AutomationRegistryConfig, GenesisTransactionGeneratorConfig, SupraNovaConfig, +}; +use crate::contracts::supra_nova_contracts::{ + FeeOperator, FeeOperatorProxy, Hypernova, HypernovaProxy, TokenBridge, TokenBridgeProxy, + TokenVault, TokenVaultProxy, WrappedTokenFactory, WrappedTokenFactoryProxy, FEE_OPERATOR, + FEE_OPERATOR_PROXY, HYPERNOVA, HYPERNOVA_PROXY, TOKEN_BRIDGE, TOKEN_BRIDGE_PROXY, TOKEN_VAULT, + TOKEN_VAULT_PROXY, WRAPPED_TOKEN, WRAPPED_TOKEN_FACTORY, WRAPPED_TOKEN_FACTORY_PROXY, +}; +use crate::contracts::transaction::{ + GenesisTransaction, GenesisTransactionTags, CREATE2_FACTORY_ADDRESS, CREATE2_FACTORY_CODE, + CREATE2_FACTORY_OWNER, +}; use alloy::primitives::Address; use alloy_sol_types::{sol, SolCall, SolConstructor}; use anyhow::{anyhow, Result}; use bincode::config; use once_cell::sync::Lazy; use primitives::supra_constants::VM_SIGNER; -use primitives::{Bytes, U256}; +use primitives::{Bytes, TxKind, U256}; use std::collections::BTreeMap; /// Load precompiled combined bytecode of contracts. const CONTRACT_BYTECODES_RAW: &[u8] = - include_bytes!(concat!(env!("OUT_DIR"), "/contract_bytecodes.bin")); + include_bytes!(concat!(env!("OUT_DIR"), "/supra_contracts_bytecode.bin")); const CONTRACT_BYTECODES: Lazy>> = Lazy::new(|| { // Deserialize the bytecodes from the raw bytes @@ -44,9 +55,14 @@ sol! { ///////////////////// ERC20Supra related contracts and init APIs ///////////////////////////// const ERC20_SUPRA: &str = "ERC20Supra"; +const ERC20_SUPRA_HANDLER: &str = "ERC20SupraHandler"; sol! { contract ERC20Supra { - constructor(address _initialOwner); + function initialize(address _initialOwner, address[] memory _authorizedAddresses); + } + + contract ERC20SupraHandler { + function initialize(address _initialOwner, address _erc20Supra); } } @@ -68,11 +84,26 @@ sol! { ///////////////////// Automation related contracts and init APIs ///////////////////////////// -const AUTOMATION_CORE: &str = "AutomationCore"; -const AUTOMATION_REGISTRY: &str = "AutomationRegistry"; -const AUTOMATION_CONTROLLER: &str = "AutomationController"; +const DIAMOND_CUT_FACET: &str = "DiamondCutFacet"; +const DIAMOND: &str = "Diamond"; +const DIAMOND_LOUPE_FACET: &str = "DiamondLoupeFacet"; +const OWNERSHIP_FACET: &str = "OwnershipFacet"; +const CONFIG_FACET: &str = "ConfigFacet"; +const REGISTRY_FACET: &str = "RegistryFacet"; +const CORE_FACET: &str = "CoreFacet"; +const DIAMOND_INIT: &str = "DiamondInit"; sol! { + /// Facet cut actions + enum FacetCutAction {Add, Replace, Remove} + // Add=0, Replace=1, Remove=2 + + struct FacetCut { + address facetAddress; + FacetCutAction action; + bytes4[] functionSelectors; + } + /// Initialization parameters for AutomationCore contract. struct InitializeParams { uint64 taskDurationCapSecs; @@ -89,30 +120,20 @@ sol! { uint16 sysTaskCapacity; address vmSigner; address erc20Supra; - address controller; - address registry; - address owner; + bool registrationEnabled; + bool automationEnabled; } - /// AutomationCore is a UUPS upgradeable contract - constructor has no parameters. - /// Deployed behind ERC1967Proxy. - contract AutomationCore { - constructor(); - function initialize(InitializeParams calldata params); + contract Diamond { + constructor(address _owner, address _diamond_cut); } - /// AutomationRegistry is a UUPS upgradeable contract - constructor has no parameters. - /// Deployed behind ERC1967Proxy. - contract AutomationRegistry { - constructor(); - function initialize(address _automationCore, address _automationController, address _owner); + contract DiamondInit { + function initialize(InitializeParams calldata params); } - /// AutomationController is a UUPS upgradeable contract - constructor has no parameters. - /// Deployed behind ERC1967Proxy. - contract AutomationController { - constructor(); - function initialize(address _automationCore, address _registry, address _owner, bool _automationEnabled, uint64 _cycleDurationSecs); + contract DiamondCutFacet { + function diamondCut(FacetCut[] calldata _diamondCut, address _diamond_init, bytes calldata _diamond_init_calldata); } } @@ -140,6 +161,18 @@ impl GenesisTransactionGenerator { Self { nonce, address } } + /// Generates Create2Factory contract deployment transaction. + fn generate_create2_factory_transaction() -> GenesisTransaction { + GenesisTransaction::new( + CREATE2_FACTORY_OWNER, + TxKind::Create, + CREATE2_FACTORY_CODE.to_owned(), + 0, + CREATE2_FACTORY_ADDRESS, + 0, + ) + } + /// Prepares genesis transactions based on the input configuration. pub fn prepare_genesis_transactions( &mut self, @@ -150,25 +183,46 @@ impl GenesisTransactionGenerator { foundation_threshold, full_set, automation_config, + initial_native_token, + supra_nova_config, } = config; // First foundation multisig account setup should be done - let mut genesis_transactions = - self.setup_multisig_wallet(foundation_owners, foundation_threshold)?; + let mut genesis_transactions = BTreeMap::from([( + GenesisTransactionTags::Create2Factory, + Self::generate_create2_factory_transaction(), + )]); + genesis_transactions + .extend(self.setup_multisig_wallet(foundation_owners, foundation_threshold)?); if full_set { let multisig_address = *genesis_transactions .get(&GenesisTransactionTags::FoundationWallet) .expect("Foundation Wallet deployment transaction") .deploy_address(); - let erc20_supra_txn = self.setup_erc20_supra(multisig_address)?; - let erc20_supra_address = *erc20_supra_txn.deploy_address(); - genesis_transactions.insert(GenesisTransactionTags::Erc20Supra, erc20_supra_txn); + + // Erc20 Supra contracts + let erc20_contracts = + self.setup_erc20_contracts(multisig_address, initial_native_token)?; + let erc20supra_address = self + .address + .create(GenesisTransactionTags::Erc20Supra as u64); + genesis_transactions.extend(erc20_contracts); + + // BlockMetadata contract genesis_transactions.extend(self.setup_block_metadata(multisig_address)?.into_iter()); + + // Automation registry contracts if let Some(config) = automation_config { genesis_transactions.extend( - self.setup_automation_registry(multisig_address, erc20_supra_address, config)? + self.setup_automation_registry(multisig_address, erc20supra_address, config)? .into_iter(), ); } + + // Supra Nova/Bridge contracts + if let Some(nova_conig) = supra_nova_config { + genesis_transactions + .extend(self.setup_supra_nova_contracts(nova_conig, multisig_address)?); + } }; Ok(genesis_transactions) @@ -202,7 +256,7 @@ impl GenesisTransactionGenerator { // 1. Deploy MultiSignatureWallet implementation (no constructor args) // ------------------------------------------------------------------------- let multisig_impl_create_data = Self::load_contract_bytecode(MULTISIG_WALLET)?; - let multisig_txn = GenesisTransaction::new( + let multisig_txn = GenesisTransaction::create( self.address.clone(), multisig_impl_create_data, self.nonce, @@ -222,7 +276,7 @@ impl GenesisTransactionGenerator { } .abi_encode(); let beacon_txn_data = [multisig_beacon_create_data, beacon_args].concat(); - let multisig_beacon_txn = GenesisTransaction::new( + let multisig_beacon_txn = GenesisTransaction::create( self.address.clone(), beacon_txn_data, self.nonce, @@ -250,7 +304,7 @@ impl GenesisTransactionGenerator { .abi_encode(); // Concatenate bytecode + constructor args for deployment let beacon_proxy_txn_data = [beacon_proxy_create_data, beacon_proxy_args].concat(); - let beacon_proxy_txn = GenesisTransaction::new( + let beacon_proxy_txn = GenesisTransaction::create( self.address.clone(), beacon_proxy_txn_data, self.nonce, @@ -265,42 +319,189 @@ impl GenesisTransactionGenerator { ])) } + /// Generates Erc20Supra and Erc20SupraHandler contracts deployment transactions. + /// Both are ERC1967Proxy upgradeable contracts, and are deployed in the same transaction + /// batch to ensure correct initial authorization setup. + fn setup_erc20_contracts( + &mut self, + owner: Address, + initial_native_tokens: u128, + ) -> Result> { + // Precomputed addresses + // nonce + 0: ERC20Supra Impl + // nonce + 1: ERC20Supra (Proxy) + // nonce + 2: ERC20SupraHandler Impl + // nonce + 3: ERC20SupraHandler (Proxy) + let erc20_supra_address = self.address.create(self.nonce + 1); + let erc20_handler_address = self.address.create(self.nonce + 3); + + // For now only erc20supra handler address is specified as authorized, the bridge one will be specified past deployment + let mut erc20_supra_txn = self.setup_erc20_supra(owner, vec![erc20_handler_address])?; + let gen_erc20_supra_address = *erc20_supra_txn + .get(&GenesisTransactionTags::Erc20Supra) + .expect("Erc20Supra should be deployed") + .deploy_address(); + assert_eq!( + erc20_supra_address, gen_erc20_supra_address, + "Address computed by tag and nonce should be the same" + ); + + let erc20_handler_txn = + self.setup_erc20_supra_handler(owner, gen_erc20_supra_address, initial_native_tokens)?; + let gen_erc20_handler_address = *erc20_handler_txn + .get(&GenesisTransactionTags::Erc20SupraHandler) + .expect("Erc20Supra should be deployed") + .deploy_address(); + assert_eq!( + erc20_handler_address, gen_erc20_handler_address, + "Address computed by tag and nonce should be the same" + ); + + erc20_supra_txn.extend(erc20_handler_txn); + Ok(erc20_supra_txn) + } + /// Generates genesis transaction for ERC20Supra token contract deployment. /// Deployment order follows GenesisTransactionTags: - /// 1. Erc20Supra (3) - ERC20 token contract with constructor(initialOwner) + /// 1. ERC20SupraImpl (nonce+0) - ERC20Supra implementation contract (UUPS upgradeable) + /// 2. ERC20Supra (nonce+1) - ERC1967Proxy with initialize(initialOwner, authorizedAddresses[]) /// - /// This is a non-upgradeable contract deployed directly (not behind a proxy). /// The initial owner (typically the foundation multisig wallet) receives /// administrative privileges over the token contract. - fn setup_erc20_supra(&mut self, initial_owner: Address) -> Result { + fn setup_erc20_supra( + &mut self, + initial_owner: Address, + authorized_addresses: Vec
, + ) -> Result> { // ------------------------------------------------------------------------- // Pre-compute deployment address // ------------------------------------------------------------------------- - let contract_address = self.address.create(self.nonce); + let erc20_supra_address_impl = self.address.create(self.nonce); + let erc20_supra_address = self.address.create(self.nonce + 1); // ------------------------------------------------------------------------- - // Deploy ERC20Supra - // Constructor args: initial owner address + // 1. Deploy ERC20Supra // ------------------------------------------------------------------------- let erc20_contract_create_data = Self::load_contract_bytecode(ERC20_SUPRA)?; - // Encode the constructor args - let erc20_constructor_args = ERC20Supra::constructorCall { + let erc20supra_impl = GenesisTransaction::create( + self.address, + erc20_contract_create_data, + self.nonce, + erc20_supra_address_impl, + ); + self.nonce += 1; + + // ------------------------------------------------------------------------- + // 2. Deploy ERC1967Proxy (ERC20Supra) + // Constructor args: implementation address, initialization data + // Initialization data: initialize(initialOwner, authorizedAddresses[]) + // ------------------------------------------------------------------------- + let proxy_impl_data = Self::load_contract_bytecode(ERC1967PROXY)?; + // Encode Erc20Supra initialize call + let erc20_init_args = ERC20Supra::initializeCall { _initialOwner: initial_owner, + _authorizedAddresses: authorized_addresses, + } + .abi_encode(); + // Encode the ERC1967Proxy constructor args + let proxy_args = ERC1967Proxy::constructorCall { + _impl: erc20_supra_address_impl, + _data: erc20_init_args.into(), } .abi_encode(); // Concatenate bytecode + constructor args for deployment - let erc20_txn_data = [erc20_contract_create_data, erc20_constructor_args].concat(); - let txn = - GenesisTransaction::new(self.address, erc20_txn_data, self.nonce, contract_address); + let proxy_txn_data = [proxy_impl_data, proxy_args].concat(); + let erc20supra = GenesisTransaction::create( + self.address, + proxy_txn_data, + self.nonce, + erc20_supra_address, + ); self.nonce += 1; - Ok(txn) + Ok(BTreeMap::from([ + (GenesisTransactionTags::Erc20SupraImpl, erc20supra_impl), + (GenesisTransactionTags::Erc20Supra, erc20supra), + ])) + } + + /// Generates genesis transaction for ERC20SupraHandler token conversion contract deployment. + /// Deployment order follows GenesisTransactionTags: + /// 1. ERC20SupraHandlerImpl (nonce+0) - ERC20SupraHandler implementation contract (UUPS upgradeable) + /// 2. ERC20SupraHandler (nonce+1) - ERC1967Proxy with initialize(initialOwner, erc20supra) + /// + /// The initial owner (typically the foundation multisig wallet) receives + /// administrative privileges over the token contract. + fn setup_erc20_supra_handler( + &mut self, + initial_owner: Address, + erc20supra: Address, + initial_native_tokens: u128, + ) -> Result> { + // ------------------------------------------------------------------------- + // Pre-compute deployment address + // ------------------------------------------------------------------------- + let erc20_handler_address_impl = self.address.create(self.nonce); + let erc20_handler_address = self.address.create(self.nonce + 1); + + // ------------------------------------------------------------------------- + // 1. Deploy ERC20SupraHandler + // ------------------------------------------------------------------------- + let erc20_contract_create_data = Self::load_contract_bytecode(ERC20_SUPRA_HANDLER)?; + let erc20supra_handler_impl = GenesisTransaction::create( + self.address, + erc20_contract_create_data, + self.nonce, + erc20_handler_address_impl, + ); + self.nonce += 1; + + // ------------------------------------------------------------------------- + // 2. Deploy ERC1967Proxy (ERC20SupraHandler) + // Constructor args: implementation address, initialization data + // Initialization data: initialize(initialOwner, erc20supra) + // ------------------------------------------------------------------------- + let proxy_impl_data = Self::load_contract_bytecode(ERC1967PROXY)?; + // Encode Erc20Supra initialize call + let erc20_handler_init_args = ERC20SupraHandler::initializeCall { + _initialOwner: initial_owner, + _erc20Supra: erc20supra, + } + .abi_encode(); + // Encode the ERC1967Proxy constructor args + let proxy_args = ERC1967Proxy::constructorCall { + _impl: erc20_handler_address_impl, + _data: erc20_handler_init_args.into(), + } + .abi_encode(); + // Concatenate bytecode + constructor args for deployment + let proxy_txn_data = [proxy_impl_data, proxy_args].concat(); + let erc20supra_handler = GenesisTransaction::new( + self.address, + TxKind::Create, + proxy_txn_data, + self.nonce, + erc20_handler_address, + initial_native_tokens, + ); + self.nonce += 1; + + Ok(BTreeMap::from([ + ( + GenesisTransactionTags::Erc20SupraHandlerImpl, + erc20supra_handler_impl, + ), + ( + GenesisTransactionTags::Erc20SupraHandler, + erc20supra_handler, + ), + ])) } /// Generates genesis transactions for BlockMeta contract deployment. /// Deployment order follows GenesisTransactionTags: - /// 1. BlockMetadataImpl (4) - BlockMeta implementation contract (UUPS upgradeable) - /// 2. BlockMetadata (5) - ERC1967Proxy with initialize(initialOwner) + /// 1. BlockMetadataImpl - BlockMeta implementation contract (UUPS upgradeable) + /// 2. BlockMetadata - ERC1967Proxy with initialize(initialOwner) /// /// BlockMeta is a UUPS upgradeable contract deployed behind an ERC1967Proxy. /// The proxy pattern allows future upgrades while maintaining the same address. @@ -320,7 +521,7 @@ impl GenesisTransactionGenerator { // 1. Deploy BlockMeta implementation (UUPS - no constructor args) // ------------------------------------------------------------------------- let block_metadata_impl = Self::load_contract_bytecode(BLOCK_META)?; - let block_metadata_impl_txn = GenesisTransaction::new( + let block_metadata_impl_txn = GenesisTransaction::create( self.address, block_metadata_impl, self.nonce, @@ -347,7 +548,7 @@ impl GenesisTransactionGenerator { .abi_encode(); // Concatenate bytecode + constructor args for deployment let proxy_txn_data = [proxy_impl_data, proxy_args].concat(); - let block_metadata_proxy_txn = GenesisTransaction::new( + let block_metadata_proxy_txn = GenesisTransaction::create( self.address, proxy_txn_data, self.nonce, @@ -369,181 +570,439 @@ impl GenesisTransactionGenerator { /// Generates genesis transactions for automation contracts deployment. /// Deployment order follows GenesisTransactionTags: - /// 1. AutomationControllerImpl - implementation contract - /// 2. AutomationController - ERC1967Proxy with initialize(automationCore, registry) - /// 3. AutomationCoreImpl - implementation contract - /// 4. AutomationCore - ERC1967Proxy with initialize(InitializeParams) - /// 5. AutomationRegistryImpl - implementation contract - /// 6. AutomationRegistry - ERC1967Proxy with initialize(automationCore, automationController) /// + /// 1. DiamondCutFacet, // Facet contract enabling APIs to extend facets and executed registered facet + /// 2. Diamond, // The wrapper contract of all the facets, main entry point of automation registry API + /// 3. DiamondLoupeFacet, // Facet providing API to query registered facets + /// 4. OwnershipFacet, // Facet to manage ownership credential updates and checks + /// 5. ConfigFacet, // Facet to manage automation registry configuration + /// 6. RegistryFacet, // Facet providing API for task registration, cancellation and registry state query + /// 7. CoreFacet, // Facet providing API to monitor cycle and initiate bookkeeping on cycle transition + /// 8. DiamondInit, /// All proxy addresses are pre-computed before deployment to handle circular dependencies. fn setup_automation_registry( &mut self, owner: Address, - erc20_supra_address: Address, + _erc20_supra_address: Address, registry_config: AutomationRegistryConfig, ) -> Result> { - let config = registry_config + let _config = registry_config .v1() .ok_or_else(|| anyhow!("Unhandled configuration version"))?; // Pre-compute all deployment addresses - // nonce+0: AutomationCoreImpl - // nonce+1: AutomationCore (proxy) - // nonce+2: AutomationRegistryImpl - // nonce+3: AutomationRegistry (proxy) - // nonce+4: AutomationControllerImpl - // nonce+5: AutomationController (proxy) - let core_impl_address = self.address.create(self.nonce); - let core_proxy_address = self.address.create(self.nonce + 1); - let registry_impl_address = self.address.create(self.nonce + 2); - let registry_proxy_address = self.address.create(self.nonce + 3); - let controller_impl_address = self.address.create(self.nonce + 4); - let controller_proxy_address = self.address.create(self.nonce + 5); - - let proxy_bytecode = Self::load_contract_bytecode(ERC1967PROXY)?; - - // ------------------------------------------------------------------------- - // 1. Deploy AutomationCoreImpl (UUPS - no constructor args) - // ------------------------------------------------------------------------- - let core_impl_bytecode = Self::load_contract_bytecode(AUTOMATION_CORE)?; - let core_impl_txn = GenesisTransaction::new( + // nonce+0: DiamondCutFacet (implementation for Diamond proxy) + // nonce+1: Diamond (proxy) + // nonce+2: DiamondLoupeFacet + // nonce+3: OwnershipFacet + // nonce+4: ConfigFacet + // nonce+5: RegistryFacet + // nonce+6: CoreFacet + // nonce+7: DiamondInit + + let diamond_cut_facet_addr = self.address.create(self.nonce); + let diamond_addr = self.address.create(self.nonce + 1); + let diamond_loupe_facet_addr = self.address.create(self.nonce + 2); + let ownership_facet_addr = self.address.create(self.nonce + 3); + let config_facet_addr = self.address.create(self.nonce + 4); + let registry_facet_addr = self.address.create(self.nonce + 5); + let core_facet_addr = self.address.create(self.nonce + 6); + let diamond_init_addr = self.address.create(self.nonce + 7); + + // ------------------------------------------------------------------------- + // 1. Deploy DiamondCutFacet (no constructor args) + // ------------------------------------------------------------------------- + let diamond_cut = Self::load_contract_bytecode(DIAMOND_CUT_FACET)?; + let diamond_cut_txn = GenesisTransaction::create( self.address, - core_impl_bytecode, + diamond_cut, self.nonce, - core_impl_address, + diamond_cut_facet_addr, ); self.nonce += 1; // ------------------------------------------------------------------------- - // 2. Deploy AutomationCore proxy - // ------------------------------------------------------------------------- - let core_init_params = InitializeParams { - taskDurationCapSecs: config.task_duration_cap_secs, - registryMaxGasCap: config.registry_max_gas_cap, - automationBaseFeeWeiPerSec: config.automation_base_fee_wei_per_sec, - flatRegistrationFeeWei: config.flat_registration_fee_wei, - congestionThresholdPercentage: config.congestion_threshold_percentage, - congestionBaseFeeWeiPerSec: config.congestion_base_fee_wei_per_sec, - congestionExponent: config.congestion_exponent, - taskCapacity: config.task_capacity, - cycleDurationSecs: config.cycle_duration_secs, - sysTaskDurationCapSecs: config.sys_task_duration_cap_secs, - sysRegistryMaxGasCap: config.sys_registry_max_gas_cap, - sysTaskCapacity: config.sys_task_capacity, - vmSigner: VM_SIGNER, - erc20Supra: erc20_supra_address, - controller: controller_proxy_address, - registry: registry_proxy_address, - owner, - }; - let core_init_data = AutomationCore::initializeCall { - params: core_init_params, - } - .abi_encode(); - let core_proxy_args = ERC1967Proxy::constructorCall { - _impl: core_impl_address, - _data: Bytes::from(core_init_data), + // 2. Deploy Diamond + // ------------------------------------------------------------------------- + let diamond_init_data = Self::load_contract_bytecode(DIAMOND)?; + let diamond_constructor_data = Diamond::constructorCall { + _owner: owner, + _diamond_cut: diamond_cut_facet_addr, } .abi_encode(); - let core_proxy_txn_data = [proxy_bytecode.clone(), core_proxy_args].concat(); - let core_proxy_txn = GenesisTransaction::new( + let diamond_data = [diamond_init_data, diamond_constructor_data].concat(); + let diamond_txn = + GenesisTransaction::create(self.address, diamond_data, self.nonce, diamond_addr); + self.nonce += 1; + + // ------------------------------------------------------------------------- + // 3. Deploy DiamondLoupeFacet + // ------------------------------------------------------------------------- + let diamond_loupe_data = Self::load_contract_bytecode(DIAMOND_LOUPE_FACET)?; + let diamond_loupe_txn = GenesisTransaction::create( self.address, - core_proxy_txn_data, + diamond_loupe_data, self.nonce, - core_proxy_address, + diamond_loupe_facet_addr, ); self.nonce += 1; // ------------------------------------------------------------------------- - // 3. Deploy AutomationRegistryImpl (UUPS - no constructor args) + // 4. Deploy Ownership facet // ------------------------------------------------------------------------- - let registry_impl_bytecode = Self::load_contract_bytecode(AUTOMATION_REGISTRY)?; - let registry_impl_txn = GenesisTransaction::new( + let ownership_data = Self::load_contract_bytecode(OWNERSHIP_FACET)?; + let ownership_txn = GenesisTransaction::create( self.address, - registry_impl_bytecode, + ownership_data, self.nonce, - registry_impl_address, + ownership_facet_addr, ); self.nonce += 1; // ------------------------------------------------------------------------- - // 4. Deploy AutomationRegistry proxy + // 5. Deploy Config Facet // ------------------------------------------------------------------------- - let registry_init_data = AutomationRegistry::initializeCall { - _automationCore: core_proxy_address, - _automationController: controller_proxy_address, - _owner: owner, - } - .abi_encode(); - let registry_proxy_args = ERC1967Proxy::constructorCall { - _impl: registry_impl_address, - _data: Bytes::from(registry_init_data), - } - .abi_encode(); - let registry_proxy_txn_data = [proxy_bytecode.clone(), registry_proxy_args].concat(); - let registry_proxy_txn = GenesisTransaction::new( + let config_data = Self::load_contract_bytecode(CONFIG_FACET)?; + let config_txn = + GenesisTransaction::create(self.address, config_data, self.nonce, config_facet_addr); + self.nonce += 1; + + // ------------------------------------------------------------------------- + // 6. Deploy Register facet + // ------------------------------------------------------------------------- + let register_data = Self::load_contract_bytecode(REGISTRY_FACET)?; + let register_txn = GenesisTransaction::create( self.address, - registry_proxy_txn_data, + register_data, self.nonce, - registry_proxy_address, + registry_facet_addr, ); self.nonce += 1; // ------------------------------------------------------------------------- - // 5. Deploy AutomationControllerImpl (UUPS - no constructor args) + // 6. Deploy Core facet + // ------------------------------------------------------------------------- + let core_data = Self::load_contract_bytecode(CORE_FACET)?; + let core_txn = + GenesisTransaction::create(self.address, core_data, self.nonce, core_facet_addr); + self.nonce += 1; + + // ------------------------------------------------------------------------- + // 6. Deploy Core facet // ------------------------------------------------------------------------- - let controller_impl_bytecode = Self::load_contract_bytecode(AUTOMATION_CONTROLLER)?; - let controller_impl_txn = GenesisTransaction::new( + let diamond_init_data = Self::load_contract_bytecode(DIAMOND_INIT)?; + let diamond_init_txn = GenesisTransaction::create( self.address, - controller_impl_bytecode, + diamond_init_data, self.nonce, - controller_impl_address, + diamond_init_addr, ); self.nonce += 1; - // ------------------------------------------------------------------------- - // 6. Deploy AutomationController proxy - // ------------------------------------------------------------------------- - let controller_init_data = AutomationController::initializeCall { - _automationCore: core_proxy_address, - _registry: registry_proxy_address, - _owner: owner, - _automationEnabled: config.enable_automation_feature, - _cycleDurationSecs: config.cycle_duration_secs, + Ok(BTreeMap::from([ + (GenesisTransactionTags::DiamondCutFacet, diamond_cut_txn), + (GenesisTransactionTags::Diamond, diamond_txn), + (GenesisTransactionTags::DiamondLoupeFacet, diamond_loupe_txn), + (GenesisTransactionTags::OwnershipFacet, ownership_txn), + (GenesisTransactionTags::ConfigFacet, config_txn), + (GenesisTransactionTags::RegistryFacet, register_txn), + (GenesisTransactionTags::CoreFacet, core_txn), + (GenesisTransactionTags::DiamondInit, diamond_init_txn), + ])) + } + + fn setup_supra_nova_contracts( + &mut self, + config: SupraNovaConfig, + owner: Address, + ) -> Result> { + let wrapped_token_contracts = self.setup_wrapped_token_contracts(owner)?; + let hyper_nova_contracts = self.setup_hyper_nova_contracts(owner, &config)?; + let token_vault_contracts = self.setup_token_vault_contracts(owner, &config)?; + + let hyper_nova = *hyper_nova_contracts + .get(&GenesisTransactionTags::HypernovaProxy) + .expect("Hypernova contract should be deployed") + .deploy_address(); + let fee_operator_contracts = + self.setup_fee_operator_contracts(owner, hyper_nova, &config)?; + + let token_vault = *token_vault_contracts + .get(&GenesisTransactionTags::TokenVaultProxy) + .expect("TokenVault contract should be deployed") + .deploy_address(); + let fee_operator = *fee_operator_contracts + .get(&GenesisTransactionTags::FeeOperatorProxy) + .expect("FeeOperator contract should be deployed") + .deploy_address(); + let wrapped_token = *wrapped_token_contracts + .get(&GenesisTransactionTags::WrappedTokenFactoryProxy) + .expect("WrappedToken contract should be deployed") + .deploy_address(); + let token_bridge_contracts = self.setup_token_bridge_contracts( + owner, + hyper_nova, + token_vault, + fee_operator, + wrapped_token, + &config, + )?; + let mut contract_txns = wrapped_token_contracts; + contract_txns.extend(hyper_nova_contracts); + contract_txns.extend(token_vault_contracts); + contract_txns.extend(fee_operator_contracts); + contract_txns.extend(token_bridge_contracts); + + // For future implementation of Supra Nova and Bridge contracts deployment + Ok(contract_txns) + } + + fn setup_wrapped_token_contracts( + &mut self, + owner: Address, + ) -> Result> { + let wrapped_token_init_data = Self::load_contract_bytecode(WRAPPED_TOKEN)?; + let wrapped_token_txn = GenesisTransaction::create2( + self.address, + SupraNovaConfig::WRAPPED_TOKEN_IMPL_SALT, + wrapped_token_init_data, + self.nonce, + ); + self.nonce += 1; + + let wrapped_token_fct_init_data = Self::load_contract_bytecode(WRAPPED_TOKEN_FACTORY)?; + let wrapped_token_fct_txn = GenesisTransaction::create2( + self.address, + SupraNovaConfig::WRAPPED_TOKEN_FACTORY_IMPL_SALT, + wrapped_token_fct_init_data, + self.nonce, + ); + self.nonce += 1; + + let wrapped_token_fct_init_call = WrappedTokenFactory::initializeCall { + owner, + token_impl: *wrapped_token_txn.deploy_address(), } .abi_encode(); - let controller_proxy_args = ERC1967Proxy::constructorCall { - _impl: controller_impl_address, - _data: Bytes::from(controller_init_data), + + let wrapped_token_proxy_init_data = + Self::load_contract_bytecode(WRAPPED_TOKEN_FACTORY_PROXY)?; + let wrapped_token_proxy_cnstr_data = WrappedTokenFactoryProxy::constructorCall { + factory_impl: *wrapped_token_fct_txn.deploy_address(), + init_data: wrapped_token_fct_init_call.into(), } .abi_encode(); - let controller_proxy_txn_data = [proxy_bytecode, controller_proxy_args].concat(); - let controller_proxy_txn = GenesisTransaction::new( + let wrapped_token_proxy_txn_data = [ + wrapped_token_proxy_init_data, + wrapped_token_proxy_cnstr_data, + ] + .concat(); + let wrapped_token_proxy_txn = GenesisTransaction::create2( self.address, - controller_proxy_txn_data, + SupraNovaConfig::WRAPPED_TOKEN_FACTORY_PROXY_SALT, + wrapped_token_proxy_txn_data, self.nonce, - controller_proxy_address, ); self.nonce += 1; Ok(BTreeMap::from([ + (GenesisTransactionTags::WrappedToken, wrapped_token_txn), ( - GenesisTransactionTags::AutomationControllerImpl, - controller_impl_txn, + GenesisTransactionTags::WrappedTokenFactory, + wrapped_token_fct_txn, ), ( - GenesisTransactionTags::AutomationController, - controller_proxy_txn, + GenesisTransactionTags::WrappedTokenFactoryProxy, + wrapped_token_proxy_txn, ), - (GenesisTransactionTags::AutomationCoreImpl, core_impl_txn), - (GenesisTransactionTags::AutomationCore, core_proxy_txn), + ])) + } + + fn setup_hyper_nova_contracts( + &mut self, + owner: Address, + config: &SupraNovaConfig, + ) -> Result> { + let hyper_nova_init_data = Self::load_contract_bytecode(HYPERNOVA)?; + let hyper_nova_txn = GenesisTransaction::create2( + self.address, + SupraNovaConfig::HYPER_NOVA_IMPL_SALT, + hyper_nova_init_data, + self.nonce, + ); + self.nonce += 1; + + let hyper_nova_init_call_data = Hypernova::initializeCall { + owner, + msgId: U256::from(config.hypernova_msg_id), + } + .abi_encode(); + + let hyper_nova_proxy_init_data = Self::load_contract_bytecode(HYPERNOVA_PROXY)?; + let hyper_nova_proxy_cnstr_data = HypernovaProxy::constructorCall { + hypernova_impl: *hyper_nova_txn.deploy_address(), + init_data: hyper_nova_init_call_data.into(), + } + .abi_encode(); + let hyper_nova_proxy_txn_data = + [hyper_nova_proxy_init_data, hyper_nova_proxy_cnstr_data].concat(); + let hyper_nova_proxy_txn = GenesisTransaction::create2( + self.address, + SupraNovaConfig::HYPER_NOVA_PROXY_SALT, + hyper_nova_proxy_txn_data, + self.nonce, + ); + self.nonce += 1; + + Ok(BTreeMap::from([ + (GenesisTransactionTags::Hypernova, hyper_nova_txn), + (GenesisTransactionTags::HypernovaProxy, hyper_nova_proxy_txn), + ])) + } + + fn setup_token_vault_contracts( + &mut self, + owner: Address, + config: &SupraNovaConfig, + ) -> Result> { + let token_vault_init_data = Self::load_contract_bytecode(TOKEN_VAULT)?; + let token_vault_txn = GenesisTransaction::create2( + self.address, + SupraNovaConfig::TOKEN_VAULT_IMPL_SALT, + token_vault_init_data, + self.nonce, + ); + self.nonce += 1; + + let token_vault_init_call_data = TokenVault::initializeCall { + owner, + nativeToken: config.weth9_address, + brigde: owner, + } + .abi_encode(); + + let token_vault_proxy_init_data = Self::load_contract_bytecode(TOKEN_VAULT_PROXY)?; + let token_vault_proxy_cnstr_data = TokenVaultProxy::constructorCall { + token_vault_impl: *token_vault_txn.deploy_address(), + init_data: token_vault_init_call_data.into(), + } + .abi_encode(); + let token_vault_proxy_txn_data = + [token_vault_proxy_init_data, token_vault_proxy_cnstr_data].concat(); + let token_vault_proxy_txn = GenesisTransaction::create2( + self.address, + SupraNovaConfig::TOKEN_VAULT_PROXY_SALT, + token_vault_proxy_txn_data, + self.nonce, + ); + self.nonce += 1; + + Ok(BTreeMap::from([ + (GenesisTransactionTags::TokenVault, token_vault_txn), + ( + GenesisTransactionTags::TokenVaultProxy, + token_vault_proxy_txn, + ), + ])) + } + + fn setup_fee_operator_contracts( + &mut self, + owner: Address, + hyper_nova: Address, + config: &SupraNovaConfig, + ) -> Result> { + let fee_operator_init_data = Self::load_contract_bytecode(FEE_OPERATOR)?; + let fee_operator_txn = GenesisTransaction::create2( + self.address, + SupraNovaConfig::FEE_OPERATOR_IMPL_SALT, + fee_operator_init_data, + self.nonce, + ); + self.nonce += 1; + + let fee_operator_init_call_data = FeeOperator::initializeCall { + owner, + hypernova: hyper_nova, + sValueFeed: config.dora_storage_address, + supraUsdtPairIndex: U256::from(config.supra_usdt_pair_idx), + maxStaleOraclePriceLimit: U256::from(config.max_stale_oracle_price_limit), + } + .abi_encode(); + + let fee_operator_proxy_init_data = Self::load_contract_bytecode(FEE_OPERATOR_PROXY)?; + let fee_operator_proxy_cnstr_data = FeeOperatorProxy::constructorCall { + fee_operator_impl: *fee_operator_txn.deploy_address(), + init_data: fee_operator_init_call_data.into(), + } + .abi_encode(); + let fee_operator_proxy_txn_data = + [fee_operator_proxy_init_data, fee_operator_proxy_cnstr_data].concat(); + let fee_operator_proxy_txn = GenesisTransaction::create2( + self.address, + SupraNovaConfig::FEE_OPERATOR_PROXY_SALT, + fee_operator_proxy_txn_data, + self.nonce, + ); + self.nonce += 1; + + Ok(BTreeMap::from([ + (GenesisTransactionTags::FeeOperator, fee_operator_txn), ( - GenesisTransactionTags::AutomationRegistryImpl, - registry_impl_txn, + GenesisTransactionTags::FeeOperatorProxy, + fee_operator_proxy_txn, ), + ])) + } + + fn setup_token_bridge_contracts( + &mut self, + owner: Address, + hyper_nova: Address, + fee_operator_address: Address, + token_vault_address: Address, + wrapped_token_proxy_address: Address, + config: &SupraNovaConfig, + ) -> Result> { + let token_bridge_init_data = Self::load_contract_bytecode(TOKEN_BRIDGE)?; + let token_bridge_txn = GenesisTransaction::create2( + self.address, + SupraNovaConfig::TOKEN_BRIDGE_IMPL_SALT, + token_bridge_init_data, + self.nonce, + ); + self.nonce += 1; + + let token_bridge_init_call_data = TokenBridge::initializeCall { + owner, + nativeToken: config.weth9_address, + hypernova: hyper_nova, + feeOperator: fee_operator_address, + vault: token_vault_address, + wrappedTokenFactory: wrapped_token_proxy_address, + } + .abi_encode(); + + let token_bridge_proxy_init_data = Self::load_contract_bytecode(TOKEN_BRIDGE_PROXY)?; + let token_bridge_proxy_cnstr_data = TokenBridgeProxy::constructorCall { + token_bridge_impl: *token_bridge_txn.deploy_address(), + init_data: token_bridge_init_call_data.into(), + } + .abi_encode(); + let token_bridge_proxy_txn_data = + [token_bridge_proxy_init_data, token_bridge_proxy_cnstr_data].concat(); + let token_bridge_proxy_txn = GenesisTransaction::create2( + self.address, + SupraNovaConfig::TOKEN_BRIDGE_PROXY_SALT, + token_bridge_proxy_txn_data, + self.nonce, + ); + self.nonce += 1; + + Ok(BTreeMap::from([ + (GenesisTransactionTags::TokenBridge, token_bridge_txn), ( - GenesisTransactionTags::AutomationRegistry, - registry_proxy_txn, + GenesisTransactionTags::TokenBridgeProxy, + token_bridge_proxy_txn, ), ])) } @@ -567,16 +1026,20 @@ mod tests { fn check_multisig_setup() { let mut generator = GenesisTransactionGenerator::default(); let owners = vec![u64_to_address(1), u64_to_address(2), u64_to_address(3)]; + let initial_native_token = 1000; let mut config = GenesisTransactionGeneratorConfig { foundation_owners: owners, foundation_threshold: 2, full_set: false, automation_config: None, + initial_native_token, + supra_nova_config: None, }; let result = generator .prepare_genesis_transactions(config.clone()) .unwrap(); - assert_eq!(result.len(), 3); + assert_eq!(result.len(), 4); + assert!(result.contains_key(&GenesisTransactionTags::Create2Factory)); assert!(result.contains_key(&GenesisTransactionTags::MultisigWalletImpl)); assert!(result.contains_key(&GenesisTransactionTags::MultisigBeacon)); assert!(result.contains_key(&GenesisTransactionTags::FoundationWallet)); @@ -586,16 +1049,27 @@ mod tests { let result = generator .prepare_genesis_transactions(config) .expect("Successful txn generation"); + assert!(result.contains_key(&GenesisTransactionTags::Create2Factory)); assert!(result.contains_key(&GenesisTransactionTags::FoundationWallet)); assert!(result.contains_key(&GenesisTransactionTags::BlockMetadata)); + assert!(result.contains_key(&GenesisTransactionTags::Erc20SupraImpl)); assert!(result.contains_key(&GenesisTransactionTags::Erc20Supra)); + assert!(result.contains_key(&GenesisTransactionTags::Erc20SupraHandlerImpl)); + assert!(result.contains_key(&GenesisTransactionTags::Erc20SupraHandler)); + let erc20_supra_handler = result + .get(&GenesisTransactionTags::Erc20SupraHandler) + .unwrap(); + assert_eq!(erc20_supra_handler.value(), &initial_native_token); + // Verify automation contracts are not deployed - assert!(!result.contains_key(&GenesisTransactionTags::AutomationControllerImpl)); - assert!(!result.contains_key(&GenesisTransactionTags::AutomationController)); - assert!(!result.contains_key(&GenesisTransactionTags::AutomationCoreImpl)); - assert!(!result.contains_key(&GenesisTransactionTags::AutomationCore)); - assert!(!result.contains_key(&GenesisTransactionTags::AutomationRegistryImpl)); - assert!(!result.contains_key(&GenesisTransactionTags::AutomationRegistry)); + assert!(!result.contains_key(&GenesisTransactionTags::DiamondCutFacet)); + assert!(!result.contains_key(&GenesisTransactionTags::Diamond)); + assert!(!result.contains_key(&GenesisTransactionTags::DiamondLoupeFacet)); + assert!(!result.contains_key(&GenesisTransactionTags::OwnershipFacet)); + assert!(!result.contains_key(&GenesisTransactionTags::ConfigFacet)); + assert!(!result.contains_key(&GenesisTransactionTags::RegistryFacet)); + assert!(!result.contains_key(&GenesisTransactionTags::CoreFacet)); + assert!(!result.contains_key(&GenesisTransactionTags::DiamondInit)); println!("{result:#?}"); } @@ -614,18 +1088,59 @@ mod tests { foundation_threshold: 2, full_set: true, automation_config: Some(custom_config.into()), + initial_native_token: 1000, + supra_nova_config: None, + }; + let result = generator + .prepare_genesis_transactions(config) + .expect("Successful txn generation"); + + // Verify all automation contracts are deployed + assert!(result.contains_key(&GenesisTransactionTags::DiamondCutFacet)); + assert!(result.contains_key(&GenesisTransactionTags::Diamond)); + assert!(result.contains_key(&GenesisTransactionTags::DiamondLoupeFacet)); + assert!(result.contains_key(&GenesisTransactionTags::OwnershipFacet)); + assert!(result.contains_key(&GenesisTransactionTags::ConfigFacet)); + assert!(result.contains_key(&GenesisTransactionTags::RegistryFacet)); + assert!(result.contains_key(&GenesisTransactionTags::CoreFacet)); + assert!(result.contains_key(&GenesisTransactionTags::DiamondInit)); + println!("{result:#?}"); + } + + #[test] + fn check_supra_nova_with_custom_config() { + let mut generator = GenesisTransactionGenerator::default(); + let owners = vec![u64_to_address(1), u64_to_address(2), u64_to_address(3)]; + let custom_config = AutomationRegistryConfigV1 { + task_duration_cap_secs: 7200, + registry_max_gas_cap: 20_000_000, + task_capacity: 1000, + ..Default::default() + }; + let config = GenesisTransactionGeneratorConfig { + foundation_owners: owners, + foundation_threshold: 2, + full_set: true, + automation_config: Some(custom_config.into()), + initial_native_token: 1000, + supra_nova_config: Some(SupraNovaConfig::default()), }; let result = generator .prepare_genesis_transactions(config) .expect("Successful txn generation"); // Verify all automation contracts are deployed - assert!(result.contains_key(&GenesisTransactionTags::AutomationControllerImpl)); - assert!(result.contains_key(&GenesisTransactionTags::AutomationController)); - assert!(result.contains_key(&GenesisTransactionTags::AutomationCoreImpl)); - assert!(result.contains_key(&GenesisTransactionTags::AutomationCore)); - assert!(result.contains_key(&GenesisTransactionTags::AutomationRegistryImpl)); - assert!(result.contains_key(&GenesisTransactionTags::AutomationRegistry)); + assert!(result.contains_key(&GenesisTransactionTags::WrappedToken)); + assert!(result.contains_key(&GenesisTransactionTags::WrappedTokenFactory)); + assert!(result.contains_key(&GenesisTransactionTags::WrappedTokenFactoryProxy)); + assert!(result.contains_key(&GenesisTransactionTags::Hypernova)); + assert!(result.contains_key(&GenesisTransactionTags::HypernovaProxy)); + assert!(result.contains_key(&GenesisTransactionTags::FeeOperator)); + assert!(result.contains_key(&GenesisTransactionTags::FeeOperatorProxy)); + assert!(result.contains_key(&GenesisTransactionTags::TokenVault)); + assert!(result.contains_key(&GenesisTransactionTags::TokenVaultProxy)); + assert!(result.contains_key(&GenesisTransactionTags::TokenBridge)); + assert!(result.contains_key(&GenesisTransactionTags::TokenBridgeProxy)); println!("{result:#?}"); } } diff --git a/crates/supra-extension/src/contracts/mod.rs b/crates/supra-extension/src/contracts/mod.rs index d6e3624b3c..4d0b2a65e3 100644 --- a/crates/supra-extension/src/contracts/mod.rs +++ b/crates/supra-extension/src/contracts/mod.rs @@ -3,3 +3,4 @@ pub mod configs; pub mod generator; pub mod transaction; +pub(crate) mod supra_nova_contracts; diff --git a/crates/supra-extension/src/contracts/supra_nova_contracts.rs b/crates/supra-extension/src/contracts/supra_nova_contracts.rs new file mode 100644 index 0000000000..6223d76812 --- /dev/null +++ b/crates/supra-extension/src/contracts/supra_nova_contracts.rs @@ -0,0 +1,67 @@ +use alloy_sol_types::sol; + +pub(crate) const WRAPPED_TOKEN: &str = "WrappedToken"; +pub(crate) const WRAPPED_TOKEN_FACTORY: &str = "WrappedTokenFactory"; +pub(crate) const WRAPPED_TOKEN_FACTORY_PROXY: &str = "WrappedTokenFactoryProxy"; +pub(crate) const HYPERNOVA: &str = "Hypernova"; +pub(crate) const HYPERNOVA_PROXY: &str = "HypernovaProxy"; +pub(crate) const TOKEN_VAULT: &str = "TokenVault"; +pub(crate) const TOKEN_VAULT_PROXY: &str = "TokenVaultProxy"; +pub(crate) const FEE_OPERATOR: &str = "FeeOperator"; +pub(crate) const FEE_OPERATOR_PROXY: &str = "FeeOperatorProxy"; +pub(crate) const TOKEN_BRIDGE: &str = "TokenBridge"; +pub(crate) const TOKEN_BRIDGE_PROXY: &str = "TokenBridgeProxy"; + +sol! { + contract WrappedTokenFactory { + function initialize(address owner, address token_impl); + } + contract WrappedTokenFactoryProxy { + constructor(address factory_impl, bytes init_data); + } + + contract Hypernova { + function initialize(address owner, uint256 msgId); + } + + contract HypernovaProxy { + constructor(address hypernova_impl, bytes init_data); + } + + contract TokenVault { + function initialize(address owner, address nativeToken, address brigde); + } + + contract TokenVaultProxy { + constructor(address token_vault_impl, bytes init_data); + } + + contract FeeOperator { + function initialize( + address owner, + address hypernova, + address sValueFeed, + uint256 supraUsdtPairIndex, + uint256 maxStaleOraclePriceLimit); + } + + contract FeeOperatorProxy { + constructor(address fee_operator_impl, bytes init_data); + } + + contract TokenBridge { + function initialize( + address owner, + address nativeToken, + address hypernova, + address feeOperator, + address vault, + address wrappedTokenFactory + ); + } + + contract TokenBridgeProxy { + constructor(address token_bridge_impl, bytes init_data); + } + +} diff --git a/crates/supra-extension/src/contracts/transaction.rs b/crates/supra-extension/src/contracts/transaction.rs index 9eb8111010..197b79d3d3 100644 --- a/crates/supra-extension/src/contracts/transaction.rs +++ b/crates/supra-extension/src/contracts/transaction.rs @@ -2,25 +2,83 @@ use derive_getters::{Dissolve, Getters}; use derive_more::Constructor; -use primitives::Address; -use std::fmt::Debug; +use primitives::{keccak256, Address, TxKind, address, hex}; +use std::fmt::{Debug, Display}; + + +/// The address that deploys the default CREATE2 deployer contract. +pub const CREATE2_FACTORY_OWNER: Address = + address!("0x3fAB184622Dc19b6109349B94811493BF2a45362"); + +/// The default CREATE2 FACTORY contract address. +pub const CREATE2_FACTORY_ADDRESS: Address = + address!("0x4e59b44847b379578588920ca78fbf26c0b4956c"); + +/// The initcode of the default CREATE2 FACTORY. +pub const CREATE2_FACTORY_CODE: &[u8] = &hex!( + "604580600e600039806000f350fe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3" +); /// Represents data required to construct genesis contracts deployment transaction #[derive(Clone, Getters, Dissolve, Constructor)] pub struct GenesisTransaction { sender: Address, + kind: TxKind, data: Vec, nonce: u64, deploy_address: Address, + value: u128, +} + +impl GenesisTransaction { + /// Creates a new genesis transaction with the given parameters to deploy a contract. + pub fn create( + sender: Address, + data: Vec, + nonce: u64, + deploy_address: Address, + ) -> Self { + Self::new ( + sender, + TxKind::Create, + data, + nonce, + deploy_address, + 0, + ) + } + + /// Creates a new genesis transaction with the given parameters to deploy a contract. + pub fn create2( + sender: Address, + salt: &str, + data: Vec, + nonce: u64, + ) -> Self { + let salt_hash = keccak256(salt); + let deploy_address = CREATE2_FACTORY_ADDRESS.create2_from_code(salt_hash, &data.as_slice()); + let call_data = [ salt_hash.to_vec(), data].concat(); + Self::new ( + sender, + TxKind::Call(CREATE2_FACTORY_ADDRESS), + call_data, + nonce, + deploy_address, + 0, + ) + } + } impl Debug for GenesisTransaction { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { f.debug_struct("GenesisTransaction") .field("sender", &self.sender) + .field("kind", &self.kind) .field("data", &self.data.len()) .field("nonce", &self.nonce) .field("deploy_address", &self.deploy_address) + .field("value", &self.value) .finish() } } @@ -28,17 +86,46 @@ impl Debug for GenesisTransaction { /// Genesis transaction tags which also guide deployment/execution order #[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] #[allow(missing_docs)] +#[repr(u8)] pub enum GenesisTransactionTags { - MultisigWalletImpl = 0, - MultisigBeacon = 1, - FoundationWallet = 2, - Erc20Supra = 3, - BlockMetadataImpl = 4, - BlockMetadata = 5, - AutomationCoreImpl = 6, - AutomationCore = 7, - AutomationRegistryImpl = 8, - AutomationRegistry = 9, - AutomationControllerImpl = 10, - AutomationController = 11, + Create2Factory = 0, + // Main system and foundation contracts + MultisigWalletImpl = 1, + MultisigBeacon = 2, + FoundationWallet = 3, + Erc20SupraImpl = 4, + Erc20Supra = 5, + Erc20SupraHandlerImpl = 6, + Erc20SupraHandler = 7, + BlockMetadataImpl = 8, + BlockMetadata = 9, + + // Automation registry contracts + DiamondCutFacet = 10, + Diamond = 11, + DiamondLoupeFacet = 12, + OwnershipFacet = 13, + ConfigFacet = 14, + RegistryFacet = 15, + CoreFacet = 16, + DiamondInit = 17, + + // Supra Nova contracts + WrappedToken = 18, // Impl + WrappedTokenFactory = 19, // Beacon + WrappedTokenFactoryProxy = 20, // Beacon Proxy + Hypernova = 21, + HypernovaProxy = 22, + TokenVault = 23, + TokenVaultProxy = 24, + FeeOperator = 25, + FeeOperatorProxy = 26, + TokenBridge = 27, + TokenBridgeProxy = 28, +} + +impl Display for GenesisTransactionTags { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "{:?}", self) + } } diff --git a/crates/supra-extension/src/lib.rs b/crates/supra-extension/src/lib.rs index 8a6b3bdc9b..9c8c245dc7 100644 --- a/crates/supra-extension/src/lib.rs +++ b/crates/supra-extension/src/lib.rs @@ -5,5 +5,9 @@ pub mod contracts; pub mod errors; #[allow(missing_docs, missing_debug_implementations)] #[allow(elided_lifetimes_in_paths)] -pub mod supra_contract_bindings; +mod supra_contract_bindings; pub mod transactions; +pub use crate::supra_contract_bindings::supra_contracts_bindings::{ + LibCommon::{CycleDetails, CycleState, TaskState, TaskType}, + SupraContractsBindings::*, +}; diff --git a/crates/supra-extension/src/supra_contract_bindings/mod.rs b/crates/supra-extension/src/supra_contract_bindings/mod.rs index f95e49cc7a..9b6d7d06b0 100644 --- a/crates/supra-extension/src/supra_contract_bindings/mod.rs +++ b/crates/supra-extension/src/supra_contract_bindings/mod.rs @@ -1,6 +1,6 @@ -#![allow(unused_imports, unused_attributes, clippy::all, rustdoc::all)] +#![allow(unused_imports, unused_attributes, clippy::all, rustdoc::all, dead_code, unreachable_pub)] //! This module contains the sol! generated bindings for solidity contracts. //! This is autogenerated code. //! Do not manually edit these files. //! These files may be overwritten by the codegen system at any time. -pub mod r#supra_contracts_bindings; +pub(crate) mod r#supra_contracts_bindings; diff --git a/crates/supra-extension/src/supra_contract_bindings/supra_contracts_bindings.rs b/crates/supra-extension/src/supra_contract_bindings/supra_contracts_bindings.rs index 6d91a3276f..bba574c3a1 100644 --- a/crates/supra-extension/src/supra_contract_bindings/supra_contracts_bindings.rs +++ b/crates/supra-extension/src/supra_contract_bindings/supra_contracts_bindings.rs @@ -2,12 +2,11 @@ /** ```solidity -library CommonUtils { +library LibCommon { type CycleState is uint8; type TaskState is uint8; type TaskType is uint8; struct CycleDetails { uint64 index; uint64 startTime; uint64 durationSecs; CycleState state; uint64 nextTaskIndexPosition; uint64[] expectedTasksToBeProcessed; } - struct TaskDetails { uint128 maxGasAmount; uint128 gasPriceCap; uint128 automationFeeCapForCycle; uint128 depositFee; bytes32 txHash; uint64 taskIndex; uint64 registrationTime; uint64 expiryTime; uint64 priority; TaskType taskType; TaskState state; address owner; bytes payloadTx; bytes[] auxData; } } ```*/ #[allow( @@ -17,7 +16,7 @@ library CommonUtils { clippy::style, clippy::empty_structs_with_brackets )] -pub mod CommonUtils { +pub mod LibCommon { use super::*; use alloy::sol_types as alloy_sol_types; #[derive(serde::Serialize, serde::Deserialize)] @@ -759,598 +758,92 @@ struct CycleDetails { uint64 index; uint64 startTime; uint64 durationSecs; Cycle } } }; - #[derive(serde::Serialize, serde::Deserialize)] - #[derive(Default, Debug, PartialEq, Eq, Hash)] - /**```solidity -struct TaskDetails { uint128 maxGasAmount; uint128 gasPriceCap; uint128 automationFeeCapForCycle; uint128 depositFee; bytes32 txHash; uint64 taskIndex; uint64 registrationTime; uint64 expiryTime; uint64 priority; TaskType taskType; TaskState state; address owner; bytes payloadTx; bytes[] auxData; } -```*/ - #[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)] + use alloy::contract as alloy_contract; + /**Creates a new wrapper around an on-chain [`LibCommon`](self) contract instance. + +See the [wrapper's documentation](`LibCommonInstance`) for more details.*/ + #[inline] + pub const fn new< + P: alloy_contract::private::Provider, + N: alloy_contract::private::Network, + >( + address: alloy_sol_types::private::Address, + __provider: P, + ) -> LibCommonInstance { + LibCommonInstance::::new(address, __provider) + } + /**A [`LibCommon`](self) instance. + +Contains type-safe methods for interacting with an on-chain instance of the +[`LibCommon`](self) contract located at a given `address`, using a given +provider `P`. + +If the contract bytecode is available (see the [`sol!`](alloy_sol_types::sol!) +documentation on how to provide it), the `deploy` and `deploy_builder` methods can +be used to deploy a new instance of the contract. + +See the [module-level documentation](self) for all the available methods.*/ #[derive(Clone)] - pub struct TaskDetails { - #[allow(missing_docs)] - pub maxGasAmount: u128, - #[allow(missing_docs)] - pub gasPriceCap: u128, - #[allow(missing_docs)] - pub automationFeeCapForCycle: u128, - #[allow(missing_docs)] - pub depositFee: u128, - #[allow(missing_docs)] - pub txHash: alloy::sol_types::private::FixedBytes<32>, - #[allow(missing_docs)] - pub taskIndex: u64, - #[allow(missing_docs)] - pub registrationTime: u64, - #[allow(missing_docs)] - pub expiryTime: u64, - #[allow(missing_docs)] - pub priority: u64, - #[allow(missing_docs)] - pub taskType: ::RustType, - #[allow(missing_docs)] - pub state: ::RustType, - #[allow(missing_docs)] - pub owner: alloy::sol_types::private::Address, - #[allow(missing_docs)] - pub payloadTx: alloy::sol_types::private::Bytes, - #[allow(missing_docs)] - pub auxData: alloy::sol_types::private::Vec, + pub struct LibCommonInstance { + address: alloy_sol_types::private::Address, + provider: P, + _network: ::core::marker::PhantomData, } - #[allow( - non_camel_case_types, - non_snake_case, - clippy::pub_underscore_fields, - clippy::style - )] - const _: () = { - use alloy::sol_types as alloy_sol_types; - #[doc(hidden)] - #[allow(dead_code)] - type UnderlyingSolTuple<'a> = ( - alloy::sol_types::sol_data::Uint<128>, - alloy::sol_types::sol_data::Uint<128>, - alloy::sol_types::sol_data::Uint<128>, - alloy::sol_types::sol_data::Uint<128>, - alloy::sol_types::sol_data::FixedBytes<32>, - alloy::sol_types::sol_data::Uint<64>, - alloy::sol_types::sol_data::Uint<64>, - alloy::sol_types::sol_data::Uint<64>, - alloy::sol_types::sol_data::Uint<64>, - TaskType, - TaskState, - alloy::sol_types::sol_data::Address, - alloy::sol_types::sol_data::Bytes, - alloy::sol_types::sol_data::Array, - ); - #[doc(hidden)] - type UnderlyingRustTuple<'a> = ( - u128, - u128, - u128, - u128, - alloy::sol_types::private::FixedBytes<32>, - u64, - u64, - u64, - u64, - ::RustType, - ::RustType, - alloy::sol_types::private::Address, - alloy::sol_types::private::Bytes, - alloy::sol_types::private::Vec, - ); - #[cfg(test)] - #[allow(dead_code, unreachable_patterns)] - fn _type_assertion( - _t: alloy_sol_types::private::AssertTypeEq, - ) { - match _t { - alloy_sol_types::private::AssertTypeEq::< - ::RustType, - >(_) => {} - } + #[automatically_derived] + impl ::core::fmt::Debug for LibCommonInstance { + #[inline] + fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result { + f.debug_tuple("LibCommonInstance").field(&self.address).finish() } - #[automatically_derived] - #[doc(hidden)] - impl ::core::convert::From for UnderlyingRustTuple<'_> { - fn from(value: TaskDetails) -> Self { - ( - value.maxGasAmount, - value.gasPriceCap, - value.automationFeeCapForCycle, - value.depositFee, - value.txHash, - value.taskIndex, - value.registrationTime, - value.expiryTime, - value.priority, - value.taskType, - value.state, - value.owner, - value.payloadTx, - value.auxData, - ) + } + /// Instantiation and getters/setters. + impl< + P: alloy_contract::private::Provider, + N: alloy_contract::private::Network, + > LibCommonInstance { + /**Creates a new wrapper around an on-chain [`LibCommon`](self) contract instance. + +See the [wrapper's documentation](`LibCommonInstance`) for more details.*/ + #[inline] + pub const fn new( + address: alloy_sol_types::private::Address, + __provider: P, + ) -> Self { + Self { + address, + provider: __provider, + _network: ::core::marker::PhantomData, } } - #[automatically_derived] - #[doc(hidden)] - impl ::core::convert::From> for TaskDetails { - fn from(tuple: UnderlyingRustTuple<'_>) -> Self { - Self { - maxGasAmount: tuple.0, - gasPriceCap: tuple.1, - automationFeeCapForCycle: tuple.2, - depositFee: tuple.3, - txHash: tuple.4, - taskIndex: tuple.5, - registrationTime: tuple.6, - expiryTime: tuple.7, - priority: tuple.8, - taskType: tuple.9, - state: tuple.10, - owner: tuple.11, - payloadTx: tuple.12, - auxData: tuple.13, - } - } + /// Returns a reference to the address. + #[inline] + pub const fn address(&self) -> &alloy_sol_types::private::Address { + &self.address } - #[automatically_derived] - impl alloy_sol_types::SolValue for TaskDetails { - type SolType = Self; + /// Sets the address. + #[inline] + pub fn set_address(&mut self, address: alloy_sol_types::private::Address) { + self.address = address; } - #[automatically_derived] - impl alloy_sol_types::private::SolTypeValue for TaskDetails { - #[inline] - fn stv_to_tokens(&self) -> ::Token<'_> { - ( - as alloy_sol_types::SolType>::tokenize(&self.maxGasAmount), - as alloy_sol_types::SolType>::tokenize(&self.gasPriceCap), - as alloy_sol_types::SolType>::tokenize( - &self.automationFeeCapForCycle, - ), - as alloy_sol_types::SolType>::tokenize(&self.depositFee), - as alloy_sol_types::SolType>::tokenize(&self.txHash), - as alloy_sol_types::SolType>::tokenize(&self.taskIndex), - as alloy_sol_types::SolType>::tokenize(&self.registrationTime), - as alloy_sol_types::SolType>::tokenize(&self.expiryTime), - as alloy_sol_types::SolType>::tokenize(&self.priority), - ::tokenize(&self.taskType), - ::tokenize(&self.state), - ::tokenize( - &self.owner, - ), - ::tokenize( - &self.payloadTx, - ), - as alloy_sol_types::SolType>::tokenize(&self.auxData), - ) - } - #[inline] - fn stv_abi_encoded_size(&self) -> usize { - if let Some(size) = ::ENCODED_SIZE { - return size; - } - let tuple = as ::core::convert::From>::from(self.clone()); - as alloy_sol_types::SolType>::abi_encoded_size(&tuple) - } - #[inline] - fn stv_eip712_data_word(&self) -> alloy_sol_types::Word { - ::eip712_hash_struct(self) - } - #[inline] - fn stv_abi_encode_packed_to( - &self, - out: &mut alloy_sol_types::private::Vec, - ) { - let tuple = as ::core::convert::From>::from(self.clone()); - as alloy_sol_types::SolType>::abi_encode_packed_to(&tuple, out) - } - #[inline] - fn stv_abi_packed_encoded_size(&self) -> usize { - if let Some(size) = ::PACKED_ENCODED_SIZE { - return size; - } - let tuple = as ::core::convert::From>::from(self.clone()); - as alloy_sol_types::SolType>::abi_packed_encoded_size(&tuple) - } + /// Sets the address and returns `self`. + pub fn at(mut self, address: alloy_sol_types::private::Address) -> Self { + self.set_address(address); + self } - #[automatically_derived] - impl alloy_sol_types::SolType for TaskDetails { - type RustType = Self; - type Token<'a> = as alloy_sol_types::SolType>::Token<'a>; - const SOL_NAME: &'static str = ::NAME; - const ENCODED_SIZE: Option = as alloy_sol_types::SolType>::ENCODED_SIZE; - const PACKED_ENCODED_SIZE: Option = as alloy_sol_types::SolType>::PACKED_ENCODED_SIZE; - #[inline] - fn valid_token(token: &Self::Token<'_>) -> bool { - as alloy_sol_types::SolType>::valid_token(token) - } - #[inline] - fn detokenize(token: Self::Token<'_>) -> Self::RustType { - let tuple = as alloy_sol_types::SolType>::detokenize(token); - >>::from(tuple) - } + /// Returns a reference to the provider. + #[inline] + pub const fn provider(&self) -> &P { + &self.provider } - #[automatically_derived] - impl alloy_sol_types::SolStruct for TaskDetails { - const NAME: &'static str = "TaskDetails"; - #[inline] - fn eip712_root_type() -> alloy_sol_types::private::Cow<'static, str> { - alloy_sol_types::private::Cow::Borrowed( - "TaskDetails(uint128 maxGasAmount,uint128 gasPriceCap,uint128 automationFeeCapForCycle,uint128 depositFee,bytes32 txHash,uint64 taskIndex,uint64 registrationTime,uint64 expiryTime,uint64 priority,uint8 taskType,uint8 state,address owner,bytes payloadTx,bytes[] auxData)", - ) - } - #[inline] - fn eip712_components() -> alloy_sol_types::private::Vec< - alloy_sol_types::private::Cow<'static, str>, - > { - alloy_sol_types::private::Vec::new() - } - #[inline] - fn eip712_encode_type() -> alloy_sol_types::private::Cow<'static, str> { - ::eip712_root_type() - } - #[inline] - fn eip712_encode_data(&self) -> alloy_sol_types::private::Vec { - [ - as alloy_sol_types::SolType>::eip712_data_word(&self.maxGasAmount) - .0, - as alloy_sol_types::SolType>::eip712_data_word(&self.gasPriceCap) - .0, - as alloy_sol_types::SolType>::eip712_data_word( - &self.automationFeeCapForCycle, - ) - .0, - as alloy_sol_types::SolType>::eip712_data_word(&self.depositFee) - .0, - as alloy_sol_types::SolType>::eip712_data_word(&self.txHash) - .0, - as alloy_sol_types::SolType>::eip712_data_word(&self.taskIndex) - .0, - as alloy_sol_types::SolType>::eip712_data_word( - &self.registrationTime, - ) - .0, - as alloy_sol_types::SolType>::eip712_data_word(&self.expiryTime) - .0, - as alloy_sol_types::SolType>::eip712_data_word(&self.priority) - .0, - ::eip712_data_word( - &self.taskType, - ) - .0, - ::eip712_data_word( - &self.state, - ) - .0, - ::eip712_data_word( - &self.owner, - ) - .0, - ::eip712_data_word( - &self.payloadTx, - ) - .0, - as alloy_sol_types::SolType>::eip712_data_word(&self.auxData) - .0, - ] - .concat() - } - } - #[automatically_derived] - impl alloy_sol_types::EventTopic for TaskDetails { - #[inline] - fn topic_preimage_length(rust: &Self::RustType) -> usize { - 0usize - + as alloy_sol_types::EventTopic>::topic_preimage_length( - &rust.maxGasAmount, - ) - + as alloy_sol_types::EventTopic>::topic_preimage_length( - &rust.gasPriceCap, - ) - + as alloy_sol_types::EventTopic>::topic_preimage_length( - &rust.automationFeeCapForCycle, - ) - + as alloy_sol_types::EventTopic>::topic_preimage_length( - &rust.depositFee, - ) - + as alloy_sol_types::EventTopic>::topic_preimage_length( - &rust.txHash, - ) - + as alloy_sol_types::EventTopic>::topic_preimage_length( - &rust.taskIndex, - ) - + as alloy_sol_types::EventTopic>::topic_preimage_length( - &rust.registrationTime, - ) - + as alloy_sol_types::EventTopic>::topic_preimage_length( - &rust.expiryTime, - ) - + as alloy_sol_types::EventTopic>::topic_preimage_length( - &rust.priority, - ) - + ::topic_preimage_length( - &rust.taskType, - ) - + ::topic_preimage_length( - &rust.state, - ) - + ::topic_preimage_length( - &rust.owner, - ) - + ::topic_preimage_length( - &rust.payloadTx, - ) - + as alloy_sol_types::EventTopic>::topic_preimage_length( - &rust.auxData, - ) - } - #[inline] - fn encode_topic_preimage( - rust: &Self::RustType, - out: &mut alloy_sol_types::private::Vec, - ) { - out.reserve( - ::topic_preimage_length(rust), - ); - as alloy_sol_types::EventTopic>::encode_topic_preimage( - &rust.maxGasAmount, - out, - ); - as alloy_sol_types::EventTopic>::encode_topic_preimage( - &rust.gasPriceCap, - out, - ); - as alloy_sol_types::EventTopic>::encode_topic_preimage( - &rust.automationFeeCapForCycle, - out, - ); - as alloy_sol_types::EventTopic>::encode_topic_preimage( - &rust.depositFee, - out, - ); - as alloy_sol_types::EventTopic>::encode_topic_preimage( - &rust.txHash, - out, - ); - as alloy_sol_types::EventTopic>::encode_topic_preimage( - &rust.taskIndex, - out, - ); - as alloy_sol_types::EventTopic>::encode_topic_preimage( - &rust.registrationTime, - out, - ); - as alloy_sol_types::EventTopic>::encode_topic_preimage( - &rust.expiryTime, - out, - ); - as alloy_sol_types::EventTopic>::encode_topic_preimage( - &rust.priority, - out, - ); - ::encode_topic_preimage( - &rust.taskType, - out, - ); - ::encode_topic_preimage( - &rust.state, - out, - ); - ::encode_topic_preimage( - &rust.owner, - out, - ); - ::encode_topic_preimage( - &rust.payloadTx, - out, - ); - as alloy_sol_types::EventTopic>::encode_topic_preimage( - &rust.auxData, - out, - ); - } - #[inline] - fn encode_topic( - rust: &Self::RustType, - ) -> alloy_sol_types::abi::token::WordToken { - let mut out = alloy_sol_types::private::Vec::new(); - ::encode_topic_preimage( - rust, - &mut out, - ); - alloy_sol_types::abi::token::WordToken( - alloy_sol_types::private::keccak256(out), - ) - } - } - }; - use alloy::contract as alloy_contract; - /**Creates a new wrapper around an on-chain [`CommonUtils`](self) contract instance. - -See the [wrapper's documentation](`CommonUtilsInstance`) for more details.*/ - #[inline] - pub const fn new< - P: alloy_contract::private::Provider, - N: alloy_contract::private::Network, - >( - address: alloy_sol_types::private::Address, - __provider: P, - ) -> CommonUtilsInstance { - CommonUtilsInstance::::new(address, __provider) - } - /**A [`CommonUtils`](self) instance. - -Contains type-safe methods for interacting with an on-chain instance of the -[`CommonUtils`](self) contract located at a given `address`, using a given -provider `P`. - -If the contract bytecode is available (see the [`sol!`](alloy_sol_types::sol!) -documentation on how to provide it), the `deploy` and `deploy_builder` methods can -be used to deploy a new instance of the contract. - -See the [module-level documentation](self) for all the available methods.*/ - #[derive(Clone)] - pub struct CommonUtilsInstance { - address: alloy_sol_types::private::Address, - provider: P, - _network: ::core::marker::PhantomData, - } - #[automatically_derived] - impl ::core::fmt::Debug for CommonUtilsInstance { - #[inline] - fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result { - f.debug_tuple("CommonUtilsInstance").field(&self.address).finish() - } - } - /// Instantiation and getters/setters. - impl< - P: alloy_contract::private::Provider, - N: alloy_contract::private::Network, - > CommonUtilsInstance { - /**Creates a new wrapper around an on-chain [`CommonUtils`](self) contract instance. - -See the [wrapper's documentation](`CommonUtilsInstance`) for more details.*/ - #[inline] - pub const fn new( - address: alloy_sol_types::private::Address, - __provider: P, - ) -> Self { - Self { - address, - provider: __provider, - _network: ::core::marker::PhantomData, - } - } - /// Returns a reference to the address. - #[inline] - pub const fn address(&self) -> &alloy_sol_types::private::Address { - &self.address - } - /// Sets the address. - #[inline] - pub fn set_address(&mut self, address: alloy_sol_types::private::Address) { - self.address = address; - } - /// Sets the address and returns `self`. - pub fn at(mut self, address: alloy_sol_types::private::Address) -> Self { - self.set_address(address); - self - } - /// Returns a reference to the provider. - #[inline] - pub const fn provider(&self) -> &P { - &self.provider - } - } - impl CommonUtilsInstance<&P, N> { - /// Clones the provider and returns a new instance with the cloned provider. - #[inline] - pub fn with_cloned_provider(self) -> CommonUtilsInstance { - CommonUtilsInstance { - address: self.address, - provider: ::core::clone::Clone::clone(&self.provider), - _network: ::core::marker::PhantomData, + } + impl LibCommonInstance<&P, N> { + /// Clones the provider and returns a new instance with the cloned provider. + #[inline] + pub fn with_cloned_provider(self) -> LibCommonInstance { + LibCommonInstance { + address: self.address, + provider: ::core::clone::Clone::clone(&self.provider), + _network: ::core::marker::PhantomData, } } } @@ -1358,7 +851,7 @@ See the [wrapper's documentation](`CommonUtilsInstance`) for more details.*/ impl< P: alloy_contract::private::Provider, N: alloy_contract::private::Network, - > CommonUtilsInstance { + > LibCommonInstance { /// Creates a new call builder using this contract instance's provider and address. /// /// Note that the call can be any function call, not just those defined in this @@ -1374,7 +867,7 @@ See the [wrapper's documentation](`CommonUtilsInstance`) for more details.*/ impl< P: alloy_contract::private::Provider, N: alloy_contract::private::Network, - > CommonUtilsInstance { + > LibCommonInstance { /// Creates a new event filter using this contract instance's provider and address. /// /// Note that the type can be any event, not just those defined in this contract. @@ -1390,7 +883,7 @@ See the [wrapper's documentation](`CommonUtilsInstance`) for more details.*/ Generated by the following Solidity interface... ```solidity -library CommonUtils { +library LibCommon { type CycleState is uint8; type TaskState is uint8; type TaskType is uint8; @@ -1402,7 +895,10 @@ library CommonUtils { uint64 nextTaskIndexPosition; uint64[] expectedTasksToBeProcessed; } - struct TaskDetails { +} + +interface SupraContractsBindings { + struct TaskMetadata { uint128 maxGasAmount; uint128 gasPriceCap; uint128 automationFeeCapForCycle; @@ -1412,23 +908,23 @@ library CommonUtils { uint64 registrationTime; uint64 expiryTime; uint64 priority; - TaskType taskType; - TaskState state; address owner; + LibCommon.TaskType taskType; + LibCommon.TaskState taskState; bytes payloadTx; + bytes predicate; bytes[] auxData; } -} -interface SupraContractsBindings { - event AutomationCycleEvent(uint64 indexed index, CommonUtils.CycleState indexed state, uint64 startTime, uint64 durationSecs, CommonUtils.CycleState indexed oldState); + event AutomationCycleEvent(uint64 indexed index, LibCommon.CycleState indexed state, uint64 startTime, uint64 durationSecs, LibCommon.CycleState indexed oldState); function blockPrologue() external; - function getAllActiveTaskIds() external view returns (uint256[] memory); - function getCycleStateDetails() external view returns (CommonUtils.CycleDetails memory details); - function getTaskDetails(uint64 _taskIndex) external view returns (CommonUtils.TaskDetails memory); - function getTaskDetailsBulk(uint64[] memory _taskIndexes) external view returns (CommonUtils.TaskDetails[] memory); + function getActiveTaskIds() external view returns (uint256[] memory); + function getCycleStateDetails() external view returns (LibCommon.CycleDetails memory); + function getTaskDetails(uint64 _taskIndex) external view returns (TaskMetadata memory); + function getTaskDetailsBulk(uint64[] memory _taskIndexes) external view returns (TaskMetadata[] memory); function getTaskIdList() external view returns (uint256[] memory); + function ifTaskExists(uint64 _taskIndex) external view returns (bool); function isAutomationEnabled() external view returns (bool); function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external; } @@ -1446,7 +942,7 @@ interface SupraContractsBindings { }, { "type": "function", - "name": "getAllActiveTaskIds", + "name": "getActiveTaskIds", "inputs": [], "outputs": [ { @@ -1463,9 +959,9 @@ interface SupraContractsBindings { "inputs": [], "outputs": [ { - "name": "details", + "name": "", "type": "tuple", - "internalType": "struct CommonUtils.CycleDetails", + "internalType": "struct LibCommon.CycleDetails", "components": [ { "name": "index", @@ -1485,7 +981,7 @@ interface SupraContractsBindings { { "name": "state", "type": "uint8", - "internalType": "enum CommonUtils.CycleState" + "internalType": "enum LibCommon.CycleState" }, { "name": "nextTaskIndexPosition", @@ -1516,7 +1012,7 @@ interface SupraContractsBindings { { "name": "", "type": "tuple", - "internalType": "struct CommonUtils.TaskDetails", + "internalType": "struct TaskMetadata", "components": [ { "name": "maxGasAmount", @@ -1563,23 +1059,28 @@ interface SupraContractsBindings { "type": "uint64", "internalType": "uint64" }, + { + "name": "owner", + "type": "address", + "internalType": "address" + }, { "name": "taskType", "type": "uint8", - "internalType": "enum CommonUtils.TaskType" + "internalType": "enum LibCommon.TaskType" }, { - "name": "state", + "name": "taskState", "type": "uint8", - "internalType": "enum CommonUtils.TaskState" + "internalType": "enum LibCommon.TaskState" }, { - "name": "owner", - "type": "address", - "internalType": "address" + "name": "payloadTx", + "type": "bytes", + "internalType": "bytes" }, { - "name": "payloadTx", + "name": "predicate", "type": "bytes", "internalType": "bytes" }, @@ -1607,7 +1108,7 @@ interface SupraContractsBindings { { "name": "", "type": "tuple[]", - "internalType": "struct CommonUtils.TaskDetails[]", + "internalType": "struct TaskMetadata[]", "components": [ { "name": "maxGasAmount", @@ -1654,23 +1155,28 @@ interface SupraContractsBindings { "type": "uint64", "internalType": "uint64" }, + { + "name": "owner", + "type": "address", + "internalType": "address" + }, { "name": "taskType", "type": "uint8", - "internalType": "enum CommonUtils.TaskType" + "internalType": "enum LibCommon.TaskType" }, { - "name": "state", + "name": "taskState", "type": "uint8", - "internalType": "enum CommonUtils.TaskState" + "internalType": "enum LibCommon.TaskState" }, { - "name": "owner", - "type": "address", - "internalType": "address" + "name": "payloadTx", + "type": "bytes", + "internalType": "bytes" }, { - "name": "payloadTx", + "name": "predicate", "type": "bytes", "internalType": "bytes" }, @@ -1697,6 +1203,25 @@ interface SupraContractsBindings { ], "stateMutability": "view" }, + { + "type": "function", + "name": "ifTaskExists", + "inputs": [ + { + "name": "_taskIndex", + "type": "uint64", + "internalType": "uint64" + } + ], + "outputs": [ + { + "name": "", + "type": "bool", + "internalType": "bool" + } + ], + "stateMutability": "view" + }, { "type": "function", "name": "isAutomationEnabled", @@ -1742,7 +1267,7 @@ interface SupraContractsBindings { "name": "state", "type": "uint8", "indexed": true, - "internalType": "enum CommonUtils.CycleState" + "internalType": "enum LibCommon.CycleState" }, { "name": "startTime", @@ -1760,7 +1285,7 @@ interface SupraContractsBindings { "name": "oldState", "type": "uint8", "indexed": true, - "internalType": "enum CommonUtils.CycleState" + "internalType": "enum LibCommon.CycleState" } ], "anonymous": false @@ -1799,9 +1324,539 @@ pub mod SupraContractsBindings { ); #[derive(serde::Serialize, serde::Deserialize)] #[derive(Default, Debug, PartialEq, Eq, Hash)] + /**```solidity +struct TaskMetadata { uint128 maxGasAmount; uint128 gasPriceCap; uint128 automationFeeCapForCycle; uint128 depositFee; bytes32 txHash; uint64 taskIndex; uint64 registrationTime; uint64 expiryTime; uint64 priority; address owner; LibCommon.TaskType taskType; LibCommon.TaskState taskState; bytes payloadTx; bytes predicate; bytes[] auxData; } +```*/ + #[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)] + #[derive(Clone)] + pub struct TaskMetadata { + #[allow(missing_docs)] + pub maxGasAmount: u128, + #[allow(missing_docs)] + pub gasPriceCap: u128, + #[allow(missing_docs)] + pub automationFeeCapForCycle: u128, + #[allow(missing_docs)] + pub depositFee: u128, + #[allow(missing_docs)] + pub txHash: alloy::sol_types::private::FixedBytes<32>, + #[allow(missing_docs)] + pub taskIndex: u64, + #[allow(missing_docs)] + pub registrationTime: u64, + #[allow(missing_docs)] + pub expiryTime: u64, + #[allow(missing_docs)] + pub priority: u64, + #[allow(missing_docs)] + pub owner: alloy::sol_types::private::Address, + #[allow(missing_docs)] + pub taskType: ::RustType, + #[allow(missing_docs)] + pub taskState: ::RustType, + #[allow(missing_docs)] + pub payloadTx: alloy::sol_types::private::Bytes, + #[allow(missing_docs)] + pub predicate: alloy::sol_types::private::Bytes, + #[allow(missing_docs)] + pub auxData: alloy::sol_types::private::Vec, + } + #[allow( + non_camel_case_types, + non_snake_case, + clippy::pub_underscore_fields, + clippy::style + )] + const _: () = { + use alloy::sol_types as alloy_sol_types; + #[doc(hidden)] + #[allow(dead_code)] + type UnderlyingSolTuple<'a> = ( + alloy::sol_types::sol_data::Uint<128>, + alloy::sol_types::sol_data::Uint<128>, + alloy::sol_types::sol_data::Uint<128>, + alloy::sol_types::sol_data::Uint<128>, + alloy::sol_types::sol_data::FixedBytes<32>, + alloy::sol_types::sol_data::Uint<64>, + alloy::sol_types::sol_data::Uint<64>, + alloy::sol_types::sol_data::Uint<64>, + alloy::sol_types::sol_data::Uint<64>, + alloy::sol_types::sol_data::Address, + LibCommon::TaskType, + LibCommon::TaskState, + alloy::sol_types::sol_data::Bytes, + alloy::sol_types::sol_data::Bytes, + alloy::sol_types::sol_data::Array, + ); + #[doc(hidden)] + type UnderlyingRustTuple<'a> = ( + u128, + u128, + u128, + u128, + alloy::sol_types::private::FixedBytes<32>, + u64, + u64, + u64, + u64, + alloy::sol_types::private::Address, + ::RustType, + ::RustType, + alloy::sol_types::private::Bytes, + alloy::sol_types::private::Bytes, + alloy::sol_types::private::Vec, + ); + #[cfg(test)] + #[allow(dead_code, unreachable_patterns)] + fn _type_assertion( + _t: alloy_sol_types::private::AssertTypeEq, + ) { + match _t { + alloy_sol_types::private::AssertTypeEq::< + ::RustType, + >(_) => {} + } + } + #[automatically_derived] + #[doc(hidden)] + impl ::core::convert::From for UnderlyingRustTuple<'_> { + fn from(value: TaskMetadata) -> Self { + ( + value.maxGasAmount, + value.gasPriceCap, + value.automationFeeCapForCycle, + value.depositFee, + value.txHash, + value.taskIndex, + value.registrationTime, + value.expiryTime, + value.priority, + value.owner, + value.taskType, + value.taskState, + value.payloadTx, + value.predicate, + value.auxData, + ) + } + } + #[automatically_derived] + #[doc(hidden)] + impl ::core::convert::From> for TaskMetadata { + fn from(tuple: UnderlyingRustTuple<'_>) -> Self { + Self { + maxGasAmount: tuple.0, + gasPriceCap: tuple.1, + automationFeeCapForCycle: tuple.2, + depositFee: tuple.3, + txHash: tuple.4, + taskIndex: tuple.5, + registrationTime: tuple.6, + expiryTime: tuple.7, + priority: tuple.8, + owner: tuple.9, + taskType: tuple.10, + taskState: tuple.11, + payloadTx: tuple.12, + predicate: tuple.13, + auxData: tuple.14, + } + } + } + #[automatically_derived] + impl alloy_sol_types::SolValue for TaskMetadata { + type SolType = Self; + } + #[automatically_derived] + impl alloy_sol_types::private::SolTypeValue for TaskMetadata { + #[inline] + fn stv_to_tokens(&self) -> ::Token<'_> { + ( + as alloy_sol_types::SolType>::tokenize(&self.maxGasAmount), + as alloy_sol_types::SolType>::tokenize(&self.gasPriceCap), + as alloy_sol_types::SolType>::tokenize( + &self.automationFeeCapForCycle, + ), + as alloy_sol_types::SolType>::tokenize(&self.depositFee), + as alloy_sol_types::SolType>::tokenize(&self.txHash), + as alloy_sol_types::SolType>::tokenize(&self.taskIndex), + as alloy_sol_types::SolType>::tokenize(&self.registrationTime), + as alloy_sol_types::SolType>::tokenize(&self.expiryTime), + as alloy_sol_types::SolType>::tokenize(&self.priority), + ::tokenize( + &self.owner, + ), + ::tokenize( + &self.taskType, + ), + ::tokenize( + &self.taskState, + ), + ::tokenize( + &self.payloadTx, + ), + ::tokenize( + &self.predicate, + ), + as alloy_sol_types::SolType>::tokenize(&self.auxData), + ) + } + #[inline] + fn stv_abi_encoded_size(&self) -> usize { + if let Some(size) = ::ENCODED_SIZE { + return size; + } + let tuple = as ::core::convert::From>::from(self.clone()); + as alloy_sol_types::SolType>::abi_encoded_size(&tuple) + } + #[inline] + fn stv_eip712_data_word(&self) -> alloy_sol_types::Word { + ::eip712_hash_struct(self) + } + #[inline] + fn stv_abi_encode_packed_to( + &self, + out: &mut alloy_sol_types::private::Vec, + ) { + let tuple = as ::core::convert::From>::from(self.clone()); + as alloy_sol_types::SolType>::abi_encode_packed_to(&tuple, out) + } + #[inline] + fn stv_abi_packed_encoded_size(&self) -> usize { + if let Some(size) = ::PACKED_ENCODED_SIZE { + return size; + } + let tuple = as ::core::convert::From>::from(self.clone()); + as alloy_sol_types::SolType>::abi_packed_encoded_size(&tuple) + } + } + #[automatically_derived] + impl alloy_sol_types::SolType for TaskMetadata { + type RustType = Self; + type Token<'a> = as alloy_sol_types::SolType>::Token<'a>; + const SOL_NAME: &'static str = ::NAME; + const ENCODED_SIZE: Option = as alloy_sol_types::SolType>::ENCODED_SIZE; + const PACKED_ENCODED_SIZE: Option = as alloy_sol_types::SolType>::PACKED_ENCODED_SIZE; + #[inline] + fn valid_token(token: &Self::Token<'_>) -> bool { + as alloy_sol_types::SolType>::valid_token(token) + } + #[inline] + fn detokenize(token: Self::Token<'_>) -> Self::RustType { + let tuple = as alloy_sol_types::SolType>::detokenize(token); + >>::from(tuple) + } + } + #[automatically_derived] + impl alloy_sol_types::SolStruct for TaskMetadata { + const NAME: &'static str = "TaskMetadata"; + #[inline] + fn eip712_root_type() -> alloy_sol_types::private::Cow<'static, str> { + alloy_sol_types::private::Cow::Borrowed( + "TaskMetadata(uint128 maxGasAmount,uint128 gasPriceCap,uint128 automationFeeCapForCycle,uint128 depositFee,bytes32 txHash,uint64 taskIndex,uint64 registrationTime,uint64 expiryTime,uint64 priority,address owner,uint8 taskType,uint8 taskState,bytes payloadTx,bytes predicate,bytes[] auxData)", + ) + } + #[inline] + fn eip712_components() -> alloy_sol_types::private::Vec< + alloy_sol_types::private::Cow<'static, str>, + > { + alloy_sol_types::private::Vec::new() + } + #[inline] + fn eip712_encode_type() -> alloy_sol_types::private::Cow<'static, str> { + ::eip712_root_type() + } + #[inline] + fn eip712_encode_data(&self) -> alloy_sol_types::private::Vec { + [ + as alloy_sol_types::SolType>::eip712_data_word(&self.maxGasAmount) + .0, + as alloy_sol_types::SolType>::eip712_data_word(&self.gasPriceCap) + .0, + as alloy_sol_types::SolType>::eip712_data_word( + &self.automationFeeCapForCycle, + ) + .0, + as alloy_sol_types::SolType>::eip712_data_word(&self.depositFee) + .0, + as alloy_sol_types::SolType>::eip712_data_word(&self.txHash) + .0, + as alloy_sol_types::SolType>::eip712_data_word(&self.taskIndex) + .0, + as alloy_sol_types::SolType>::eip712_data_word( + &self.registrationTime, + ) + .0, + as alloy_sol_types::SolType>::eip712_data_word(&self.expiryTime) + .0, + as alloy_sol_types::SolType>::eip712_data_word(&self.priority) + .0, + ::eip712_data_word( + &self.owner, + ) + .0, + ::eip712_data_word( + &self.taskType, + ) + .0, + ::eip712_data_word( + &self.taskState, + ) + .0, + ::eip712_data_word( + &self.payloadTx, + ) + .0, + ::eip712_data_word( + &self.predicate, + ) + .0, + as alloy_sol_types::SolType>::eip712_data_word(&self.auxData) + .0, + ] + .concat() + } + } + #[automatically_derived] + impl alloy_sol_types::EventTopic for TaskMetadata { + #[inline] + fn topic_preimage_length(rust: &Self::RustType) -> usize { + 0usize + + as alloy_sol_types::EventTopic>::topic_preimage_length( + &rust.maxGasAmount, + ) + + as alloy_sol_types::EventTopic>::topic_preimage_length( + &rust.gasPriceCap, + ) + + as alloy_sol_types::EventTopic>::topic_preimage_length( + &rust.automationFeeCapForCycle, + ) + + as alloy_sol_types::EventTopic>::topic_preimage_length( + &rust.depositFee, + ) + + as alloy_sol_types::EventTopic>::topic_preimage_length( + &rust.txHash, + ) + + as alloy_sol_types::EventTopic>::topic_preimage_length( + &rust.taskIndex, + ) + + as alloy_sol_types::EventTopic>::topic_preimage_length( + &rust.registrationTime, + ) + + as alloy_sol_types::EventTopic>::topic_preimage_length( + &rust.expiryTime, + ) + + as alloy_sol_types::EventTopic>::topic_preimage_length( + &rust.priority, + ) + + ::topic_preimage_length( + &rust.owner, + ) + + ::topic_preimage_length( + &rust.taskType, + ) + + ::topic_preimage_length( + &rust.taskState, + ) + + ::topic_preimage_length( + &rust.payloadTx, + ) + + ::topic_preimage_length( + &rust.predicate, + ) + + as alloy_sol_types::EventTopic>::topic_preimage_length( + &rust.auxData, + ) + } + #[inline] + fn encode_topic_preimage( + rust: &Self::RustType, + out: &mut alloy_sol_types::private::Vec, + ) { + out.reserve( + ::topic_preimage_length(rust), + ); + as alloy_sol_types::EventTopic>::encode_topic_preimage( + &rust.maxGasAmount, + out, + ); + as alloy_sol_types::EventTopic>::encode_topic_preimage( + &rust.gasPriceCap, + out, + ); + as alloy_sol_types::EventTopic>::encode_topic_preimage( + &rust.automationFeeCapForCycle, + out, + ); + as alloy_sol_types::EventTopic>::encode_topic_preimage( + &rust.depositFee, + out, + ); + as alloy_sol_types::EventTopic>::encode_topic_preimage( + &rust.txHash, + out, + ); + as alloy_sol_types::EventTopic>::encode_topic_preimage( + &rust.taskIndex, + out, + ); + as alloy_sol_types::EventTopic>::encode_topic_preimage( + &rust.registrationTime, + out, + ); + as alloy_sol_types::EventTopic>::encode_topic_preimage( + &rust.expiryTime, + out, + ); + as alloy_sol_types::EventTopic>::encode_topic_preimage( + &rust.priority, + out, + ); + ::encode_topic_preimage( + &rust.owner, + out, + ); + ::encode_topic_preimage( + &rust.taskType, + out, + ); + ::encode_topic_preimage( + &rust.taskState, + out, + ); + ::encode_topic_preimage( + &rust.payloadTx, + out, + ); + ::encode_topic_preimage( + &rust.predicate, + out, + ); + as alloy_sol_types::EventTopic>::encode_topic_preimage( + &rust.auxData, + out, + ); + } + #[inline] + fn encode_topic( + rust: &Self::RustType, + ) -> alloy_sol_types::abi::token::WordToken { + let mut out = alloy_sol_types::private::Vec::new(); + ::encode_topic_preimage( + rust, + &mut out, + ); + alloy_sol_types::abi::token::WordToken( + alloy_sol_types::private::keccak256(out), + ) + } + } + }; + #[derive(serde::Serialize, serde::Deserialize)] + #[derive(Default, Debug, PartialEq, Eq, Hash)] /**Event with signature `AutomationCycleEvent(uint64,uint8,uint64,uint64,uint8)` and selector `0xe3a609ff9d35dde784f4ecc5c5988b3a4ad5ebeabb27e7ad22a76570128e51df`. ```solidity -event AutomationCycleEvent(uint64 indexed index, CommonUtils.CycleState indexed state, uint64 startTime, uint64 durationSecs, CommonUtils.CycleState indexed oldState); +event AutomationCycleEvent(uint64 indexed index, LibCommon.CycleState indexed state, uint64 startTime, uint64 durationSecs, LibCommon.CycleState indexed oldState); ```*/ #[allow( non_camel_case_types, @@ -1814,13 +1869,13 @@ event AutomationCycleEvent(uint64 indexed index, CommonUtils.CycleState indexed #[allow(missing_docs)] pub index: u64, #[allow(missing_docs)] - pub state: ::RustType, + pub state: ::RustType, #[allow(missing_docs)] pub startTime: u64, #[allow(missing_docs)] pub durationSecs: u64, #[allow(missing_docs)] - pub oldState: ::RustType, + pub oldState: ::RustType, } #[allow( non_camel_case_types, @@ -1842,8 +1897,8 @@ event AutomationCycleEvent(uint64 indexed index, CommonUtils.CycleState indexed type TopicList = ( alloy_sol_types::sol_data::FixedBytes<32>, alloy::sol_types::sol_data::Uint<64>, - CommonUtils::CycleState, - CommonUtils::CycleState, + LibCommon::CycleState, + LibCommon::CycleState, ); const SIGNATURE: &'static str = "AutomationCycleEvent(uint64,uint8,uint64,uint64,uint8)"; const SIGNATURE_HASH: alloy_sol_types::private::B256 = alloy_sol_types::private::B256::new([ @@ -1915,10 +1970,10 @@ event AutomationCycleEvent(uint64 indexed index, CommonUtils.CycleState indexed out[1usize] = as alloy_sol_types::EventTopic>::encode_topic(&self.index); - out[2usize] = ::encode_topic( + out[2usize] = ::encode_topic( &self.state, ); - out[3usize] = ::encode_topic( + out[3usize] = ::encode_topic( &self.oldState, ); Ok(()) @@ -2080,19 +2135,19 @@ function blockPrologue() external; }; #[derive(serde::Serialize, serde::Deserialize)] #[derive(Default, Debug, PartialEq, Eq, Hash)] - /**Function with signature `getAllActiveTaskIds()` and selector `0xc5dcf6ac`. + /**Function with signature `getActiveTaskIds()` and selector `0x2321cca3`. ```solidity -function getAllActiveTaskIds() external view returns (uint256[] memory); +function getActiveTaskIds() external view returns (uint256[] memory); ```*/ #[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)] #[derive(Clone)] - pub struct getAllActiveTaskIdsCall; + pub struct getActiveTaskIdsCall; #[derive(serde::Serialize, serde::Deserialize)] #[derive(Default, Debug, PartialEq, Eq, Hash)] - ///Container type for the return parameters of the [`getAllActiveTaskIds()`](getAllActiveTaskIdsCall) function. + ///Container type for the return parameters of the [`getActiveTaskIds()`](getActiveTaskIdsCall) function. #[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)] #[derive(Clone)] - pub struct getAllActiveTaskIdsReturn { + pub struct getActiveTaskIdsReturn { #[allow(missing_docs)] pub _0: alloy::sol_types::private::Vec< alloy::sol_types::private::primitives::aliases::U256, @@ -2125,16 +2180,16 @@ function getAllActiveTaskIds() external view returns (uint256[] memory); } #[automatically_derived] #[doc(hidden)] - impl ::core::convert::From + impl ::core::convert::From for UnderlyingRustTuple<'_> { - fn from(value: getAllActiveTaskIdsCall) -> Self { + fn from(value: getActiveTaskIdsCall) -> Self { () } } #[automatically_derived] #[doc(hidden)] impl ::core::convert::From> - for getAllActiveTaskIdsCall { + for getActiveTaskIdsCall { fn from(tuple: UnderlyingRustTuple<'_>) -> Self { Self } @@ -2165,23 +2220,23 @@ function getAllActiveTaskIds() external view returns (uint256[] memory); } #[automatically_derived] #[doc(hidden)] - impl ::core::convert::From + impl ::core::convert::From for UnderlyingRustTuple<'_> { - fn from(value: getAllActiveTaskIdsReturn) -> Self { + fn from(value: getActiveTaskIdsReturn) -> Self { (value._0,) } } #[automatically_derived] #[doc(hidden)] impl ::core::convert::From> - for getAllActiveTaskIdsReturn { + for getActiveTaskIdsReturn { fn from(tuple: UnderlyingRustTuple<'_>) -> Self { Self { _0: tuple.0 } } } } #[automatically_derived] - impl alloy_sol_types::SolCall for getAllActiveTaskIdsCall { + impl alloy_sol_types::SolCall for getActiveTaskIdsCall { type Parameters<'a> = (); type Token<'a> = = as alloy_sol_types::SolType>::Token<'a>; - const SIGNATURE: &'static str = "getAllActiveTaskIds()"; - const SELECTOR: [u8; 4] = [197u8, 220u8, 246u8, 172u8]; + const SIGNATURE: &'static str = "getActiveTaskIds()"; + const SELECTOR: [u8; 4] = [35u8, 33u8, 204u8, 163u8]; #[inline] fn new<'a>( tuple: as alloy_sol_types::SolType>::RustType, @@ -2221,7 +2276,7 @@ function getAllActiveTaskIds() external view returns (uint256[] memory); '_, > as alloy_sol_types::SolType>::abi_decode_sequence(data) .map(|r| { - let r: getAllActiveTaskIdsReturn = r.into(); + let r: getActiveTaskIdsReturn = r.into(); r._0 }) } @@ -2233,7 +2288,7 @@ function getAllActiveTaskIds() external view returns (uint256[] memory); '_, > as alloy_sol_types::SolType>::abi_decode_sequence_validate(data) .map(|r| { - let r: getAllActiveTaskIdsReturn = r.into(); + let r: getActiveTaskIdsReturn = r.into(); r._0 }) } @@ -2243,7 +2298,7 @@ function getAllActiveTaskIds() external view returns (uint256[] memory); #[derive(Default, Debug, PartialEq, Eq, Hash)] /**Function with signature `getCycleStateDetails()` and selector `0x6b5d8c56`. ```solidity -function getCycleStateDetails() external view returns (CommonUtils.CycleDetails memory details); +function getCycleStateDetails() external view returns (LibCommon.CycleDetails memory); ```*/ #[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)] #[derive(Clone)] @@ -2255,7 +2310,7 @@ function getCycleStateDetails() external view returns (CommonUtils.CycleDetails #[derive(Clone)] pub struct getCycleStateDetailsReturn { #[allow(missing_docs)] - pub details: ::RustType, + pub _0: ::RustType, } #[allow( non_camel_case_types, @@ -2302,10 +2357,10 @@ function getCycleStateDetails() external view returns (CommonUtils.CycleDetails { #[doc(hidden)] #[allow(dead_code)] - type UnderlyingSolTuple<'a> = (CommonUtils::CycleDetails,); + type UnderlyingSolTuple<'a> = (LibCommon::CycleDetails,); #[doc(hidden)] type UnderlyingRustTuple<'a> = ( - ::RustType, + ::RustType, ); #[cfg(test)] #[allow(dead_code, unreachable_patterns)] @@ -2323,7 +2378,7 @@ function getCycleStateDetails() external view returns (CommonUtils.CycleDetails impl ::core::convert::From for UnderlyingRustTuple<'_> { fn from(value: getCycleStateDetailsReturn) -> Self { - (value.details,) + (value._0,) } } #[automatically_derived] @@ -2331,7 +2386,7 @@ function getCycleStateDetails() external view returns (CommonUtils.CycleDetails impl ::core::convert::From> for getCycleStateDetailsReturn { fn from(tuple: UnderlyingRustTuple<'_>) -> Self { - Self { details: tuple.0 } + Self { _0: tuple.0 } } } } @@ -2341,8 +2396,8 @@ function getCycleStateDetails() external view returns (CommonUtils.CycleDetails type Token<'a> = as alloy_sol_types::SolType>::Token<'a>; - type Return = ::RustType; - type ReturnTuple<'a> = (CommonUtils::CycleDetails,); + type Return = ::RustType; + type ReturnTuple<'a> = (LibCommon::CycleDetails,); type ReturnToken<'a> = as alloy_sol_types::SolType>::Token<'a>; @@ -2360,7 +2415,7 @@ function getCycleStateDetails() external view returns (CommonUtils.CycleDetails } #[inline] fn tokenize_returns(ret: &Self::Return) -> Self::ReturnToken<'_> { - (::tokenize(ret),) + (::tokenize(ret),) } #[inline] fn abi_decode_returns(data: &[u8]) -> alloy_sol_types::Result { @@ -2369,7 +2424,7 @@ function getCycleStateDetails() external view returns (CommonUtils.CycleDetails > as alloy_sol_types::SolType>::abi_decode_sequence(data) .map(|r| { let r: getCycleStateDetailsReturn = r.into(); - r.details + r._0 }) } #[inline] @@ -2381,7 +2436,7 @@ function getCycleStateDetails() external view returns (CommonUtils.CycleDetails > as alloy_sol_types::SolType>::abi_decode_sequence_validate(data) .map(|r| { let r: getCycleStateDetailsReturn = r.into(); - r.details + r._0 }) } } @@ -2390,7 +2445,7 @@ function getCycleStateDetails() external view returns (CommonUtils.CycleDetails #[derive(Default, Debug, PartialEq, Eq, Hash)] /**Function with signature `getTaskDetails(uint64)` and selector `0xb2ef6896`. ```solidity -function getTaskDetails(uint64 _taskIndex) external view returns (CommonUtils.TaskDetails memory); +function getTaskDetails(uint64 _taskIndex) external view returns (TaskMetadata memory); ```*/ #[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)] #[derive(Clone)] @@ -2399,13 +2454,13 @@ function getTaskDetails(uint64 _taskIndex) external view returns (CommonUtils.Ta pub _taskIndex: u64, } #[derive(serde::Serialize, serde::Deserialize)] - #[derive()] + #[derive(Default, Debug, PartialEq, Eq, Hash)] ///Container type for the return parameters of the [`getTaskDetails(uint64)`](getTaskDetailsCall) function. #[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)] #[derive(Clone)] pub struct getTaskDetailsReturn { #[allow(missing_docs)] - pub _0: ::RustType, + pub _0: ::RustType, } #[allow( non_camel_case_types, @@ -2450,10 +2505,10 @@ function getTaskDetails(uint64 _taskIndex) external view returns (CommonUtils.Ta { #[doc(hidden)] #[allow(dead_code)] - type UnderlyingSolTuple<'a> = (CommonUtils::TaskDetails,); + type UnderlyingSolTuple<'a> = (TaskMetadata,); #[doc(hidden)] type UnderlyingRustTuple<'a> = ( - ::RustType, + ::RustType, ); #[cfg(test)] #[allow(dead_code, unreachable_patterns)] @@ -2489,8 +2544,8 @@ function getTaskDetails(uint64 _taskIndex) external view returns (CommonUtils.Ta type Token<'a> = as alloy_sol_types::SolType>::Token<'a>; - type Return = ::RustType; - type ReturnTuple<'a> = (CommonUtils::TaskDetails,); + type Return = ::RustType; + type ReturnTuple<'a> = (TaskMetadata,); type ReturnToken<'a> = as alloy_sol_types::SolType>::Token<'a>; @@ -2512,7 +2567,7 @@ function getTaskDetails(uint64 _taskIndex) external view returns (CommonUtils.Ta } #[inline] fn tokenize_returns(ret: &Self::Return) -> Self::ReturnToken<'_> { - (::tokenize(ret),) + (::tokenize(ret),) } #[inline] fn abi_decode_returns(data: &[u8]) -> alloy_sol_types::Result { @@ -2542,7 +2597,7 @@ function getTaskDetails(uint64 _taskIndex) external view returns (CommonUtils.Ta #[derive(Default, Debug, PartialEq, Eq, Hash)] /**Function with signature `getTaskDetailsBulk(uint64[])` and selector `0x12f72cf4`. ```solidity -function getTaskDetailsBulk(uint64[] memory _taskIndexes) external view returns (CommonUtils.TaskDetails[] memory); +function getTaskDetailsBulk(uint64[] memory _taskIndexes) external view returns (TaskMetadata[] memory); ```*/ #[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)] #[derive(Clone)] @@ -2551,14 +2606,14 @@ function getTaskDetailsBulk(uint64[] memory _taskIndexes) external view returns pub _taskIndexes: alloy::sol_types::private::Vec, } #[derive(serde::Serialize, serde::Deserialize)] - #[derive()] + #[derive(Default, Debug, PartialEq, Eq, Hash)] ///Container type for the return parameters of the [`getTaskDetailsBulk(uint64[])`](getTaskDetailsBulkCall) function. #[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)] #[derive(Clone)] pub struct getTaskDetailsBulkReturn { #[allow(missing_docs)] pub _0: alloy::sol_types::private::Vec< - ::RustType, + ::RustType, >, } #[allow( @@ -2609,12 +2664,12 @@ function getTaskDetailsBulk(uint64[] memory _taskIndexes) external view returns #[doc(hidden)] #[allow(dead_code)] type UnderlyingSolTuple<'a> = ( - alloy::sol_types::sol_data::Array, + alloy::sol_types::sol_data::Array, ); #[doc(hidden)] type UnderlyingRustTuple<'a> = ( alloy::sol_types::private::Vec< - ::RustType, + ::RustType, >, ); #[cfg(test)] @@ -2654,11 +2709,9 @@ function getTaskDetailsBulk(uint64[] memory _taskIndexes) external view returns 'a, > as alloy_sol_types::SolType>::Token<'a>; type Return = alloy::sol_types::private::Vec< - ::RustType, + ::RustType, >; - type ReturnTuple<'a> = ( - alloy::sol_types::sol_data::Array, - ); + type ReturnTuple<'a> = (alloy::sol_types::sol_data::Array,); type ReturnToken<'a> = as alloy_sol_types::SolType>::Token<'a>; @@ -2682,7 +2735,7 @@ function getTaskDetailsBulk(uint64[] memory _taskIndexes) external view returns fn tokenize_returns(ret: &Self::Return) -> Self::ReturnToken<'_> { ( as alloy_sol_types::SolType>::tokenize(ret), ) } @@ -2869,6 +2922,158 @@ function getTaskIdList() external view returns (uint256[] memory); }; #[derive(serde::Serialize, serde::Deserialize)] #[derive(Default, Debug, PartialEq, Eq, Hash)] + /**Function with signature `ifTaskExists(uint64)` and selector `0x8aaa404e`. +```solidity +function ifTaskExists(uint64 _taskIndex) external view returns (bool); +```*/ + #[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)] + #[derive(Clone)] + pub struct ifTaskExistsCall { + #[allow(missing_docs)] + pub _taskIndex: u64, + } + #[derive(serde::Serialize, serde::Deserialize)] + #[derive(Default, Debug, PartialEq, Eq, Hash)] + ///Container type for the return parameters of the [`ifTaskExists(uint64)`](ifTaskExistsCall) function. + #[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)] + #[derive(Clone)] + pub struct ifTaskExistsReturn { + #[allow(missing_docs)] + pub _0: bool, + } + #[allow( + non_camel_case_types, + non_snake_case, + clippy::pub_underscore_fields, + clippy::style + )] + const _: () = { + use alloy::sol_types as alloy_sol_types; + { + #[doc(hidden)] + #[allow(dead_code)] + type UnderlyingSolTuple<'a> = (alloy::sol_types::sol_data::Uint<64>,); + #[doc(hidden)] + type UnderlyingRustTuple<'a> = (u64,); + #[cfg(test)] + #[allow(dead_code, unreachable_patterns)] + fn _type_assertion( + _t: alloy_sol_types::private::AssertTypeEq, + ) { + match _t { + alloy_sol_types::private::AssertTypeEq::< + ::RustType, + >(_) => {} + } + } + #[automatically_derived] + #[doc(hidden)] + impl ::core::convert::From for UnderlyingRustTuple<'_> { + fn from(value: ifTaskExistsCall) -> Self { + (value._taskIndex,) + } + } + #[automatically_derived] + #[doc(hidden)] + impl ::core::convert::From> for ifTaskExistsCall { + fn from(tuple: UnderlyingRustTuple<'_>) -> Self { + Self { _taskIndex: tuple.0 } + } + } + } + { + #[doc(hidden)] + #[allow(dead_code)] + type UnderlyingSolTuple<'a> = (alloy::sol_types::sol_data::Bool,); + #[doc(hidden)] + type UnderlyingRustTuple<'a> = (bool,); + #[cfg(test)] + #[allow(dead_code, unreachable_patterns)] + fn _type_assertion( + _t: alloy_sol_types::private::AssertTypeEq, + ) { + match _t { + alloy_sol_types::private::AssertTypeEq::< + ::RustType, + >(_) => {} + } + } + #[automatically_derived] + #[doc(hidden)] + impl ::core::convert::From for UnderlyingRustTuple<'_> { + fn from(value: ifTaskExistsReturn) -> Self { + (value._0,) + } + } + #[automatically_derived] + #[doc(hidden)] + impl ::core::convert::From> for ifTaskExistsReturn { + fn from(tuple: UnderlyingRustTuple<'_>) -> Self { + Self { _0: tuple.0 } + } + } + } + #[automatically_derived] + impl alloy_sol_types::SolCall for ifTaskExistsCall { + type Parameters<'a> = (alloy::sol_types::sol_data::Uint<64>,); + type Token<'a> = as alloy_sol_types::SolType>::Token<'a>; + type Return = bool; + type ReturnTuple<'a> = (alloy::sol_types::sol_data::Bool,); + type ReturnToken<'a> = as alloy_sol_types::SolType>::Token<'a>; + const SIGNATURE: &'static str = "ifTaskExists(uint64)"; + const SELECTOR: [u8; 4] = [138u8, 170u8, 64u8, 78u8]; + #[inline] + fn new<'a>( + tuple: as alloy_sol_types::SolType>::RustType, + ) -> Self { + tuple.into() + } + #[inline] + fn tokenize(&self) -> Self::Token<'_> { + ( + as alloy_sol_types::SolType>::tokenize(&self._taskIndex), + ) + } + #[inline] + fn tokenize_returns(ret: &Self::Return) -> Self::ReturnToken<'_> { + ( + ::tokenize( + ret, + ), + ) + } + #[inline] + fn abi_decode_returns(data: &[u8]) -> alloy_sol_types::Result { + as alloy_sol_types::SolType>::abi_decode_sequence(data) + .map(|r| { + let r: ifTaskExistsReturn = r.into(); + r._0 + }) + } + #[inline] + fn abi_decode_returns_validate( + data: &[u8], + ) -> alloy_sol_types::Result { + as alloy_sol_types::SolType>::abi_decode_sequence_validate(data) + .map(|r| { + let r: ifTaskExistsReturn = r.into(); + r._0 + }) + } + } + }; + #[derive(serde::Serialize, serde::Deserialize)] + #[derive(Default, Debug, PartialEq, Eq, Hash)] /**Function with signature `isAutomationEnabled()` and selector `0xe48e0e98`. ```solidity function isAutomationEnabled() external view returns (bool); @@ -3182,7 +3387,7 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external #[allow(missing_docs)] blockPrologue(blockPrologueCall), #[allow(missing_docs)] - getAllActiveTaskIds(getAllActiveTaskIdsCall), + getActiveTaskIds(getActiveTaskIdsCall), #[allow(missing_docs)] getCycleStateDetails(getCycleStateDetailsCall), #[allow(missing_docs)] @@ -3192,6 +3397,8 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external #[allow(missing_docs)] getTaskIdList(getTaskIdListCall), #[allow(missing_docs)] + ifTaskExists(ifTaskExistsCall), + #[allow(missing_docs)] isAutomationEnabled(isAutomationEnabledCall), #[allow(missing_docs)] processTasks(processTasksCall), @@ -3205,33 +3412,36 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external /// Prefer using `SolInterface` methods instead. pub const SELECTORS: &'static [[u8; 4usize]] = &[ [18u8, 247u8, 44u8, 244u8], + [35u8, 33u8, 204u8, 163u8], [107u8, 93u8, 140u8, 86u8], [125u8, 237u8, 9u8, 27u8], [127u8, 105u8, 195u8, 92u8], + [138u8, 170u8, 64u8, 78u8], [178u8, 239u8, 104u8, 150u8], - [197u8, 220u8, 246u8, 172u8], [228u8, 142u8, 14u8, 152u8], [236u8, 130u8, 180u8, 41u8], ]; /// The names of the variants in the same order as `SELECTORS`. pub const VARIANT_NAMES: &'static [&'static str] = &[ ::core::stringify!(getTaskDetailsBulk), + ::core::stringify!(getActiveTaskIds), ::core::stringify!(getCycleStateDetails), ::core::stringify!(blockPrologue), ::core::stringify!(processTasks), + ::core::stringify!(ifTaskExists), ::core::stringify!(getTaskDetails), - ::core::stringify!(getAllActiveTaskIds), ::core::stringify!(isAutomationEnabled), ::core::stringify!(getTaskIdList), ]; /// The signatures in the same order as `SELECTORS`. pub const SIGNATURES: &'static [&'static str] = &[ ::SIGNATURE, + ::SIGNATURE, ::SIGNATURE, ::SIGNATURE, ::SIGNATURE, + ::SIGNATURE, ::SIGNATURE, - ::SIGNATURE, ::SIGNATURE, ::SIGNATURE, ]; @@ -3260,15 +3470,15 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external impl alloy_sol_types::SolInterface for SupraContractsBindingsCalls { const NAME: &'static str = "SupraContractsBindingsCalls"; const MIN_DATA_LENGTH: usize = 0usize; - const COUNT: usize = 8usize; + const COUNT: usize = 9usize; #[inline] fn selector(&self) -> [u8; 4] { match self { Self::blockPrologue(_) => { ::SELECTOR } - Self::getAllActiveTaskIds(_) => { - ::SELECTOR + Self::getActiveTaskIds(_) => { + ::SELECTOR } Self::getCycleStateDetails(_) => { ::SELECTOR @@ -3282,6 +3492,9 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external Self::getTaskIdList(_) => { ::SELECTOR } + Self::ifTaskExists(_) => { + ::SELECTOR + } Self::isAutomationEnabled(_) => { ::SELECTOR } @@ -3318,6 +3531,17 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external } getTaskDetailsBulk }, + { + fn getActiveTaskIds( + data: &[u8], + ) -> alloy_sol_types::Result { + ::abi_decode_raw( + data, + ) + .map(SupraContractsBindingsCalls::getActiveTaskIds) + } + getActiveTaskIds + }, { fn getCycleStateDetails( data: &[u8], @@ -3352,26 +3576,26 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external processTasks }, { - fn getTaskDetails( + fn ifTaskExists( data: &[u8], ) -> alloy_sol_types::Result { - ::abi_decode_raw( + ::abi_decode_raw( data, ) - .map(SupraContractsBindingsCalls::getTaskDetails) + .map(SupraContractsBindingsCalls::ifTaskExists) } - getTaskDetails + ifTaskExists }, { - fn getAllActiveTaskIds( + fn getTaskDetails( data: &[u8], ) -> alloy_sol_types::Result { - ::abi_decode_raw( + ::abi_decode_raw( data, ) - .map(SupraContractsBindingsCalls::getAllActiveTaskIds) + .map(SupraContractsBindingsCalls::getTaskDetails) } - getAllActiveTaskIds + getTaskDetails }, { fn isAutomationEnabled( @@ -3426,6 +3650,17 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external } getTaskDetailsBulk }, + { + fn getActiveTaskIds( + data: &[u8], + ) -> alloy_sol_types::Result { + ::abi_decode_raw_validate( + data, + ) + .map(SupraContractsBindingsCalls::getActiveTaskIds) + } + getActiveTaskIds + }, { fn getCycleStateDetails( data: &[u8], @@ -3460,26 +3695,26 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external processTasks }, { - fn getTaskDetails( + fn ifTaskExists( data: &[u8], ) -> alloy_sol_types::Result { - ::abi_decode_raw_validate( + ::abi_decode_raw_validate( data, ) - .map(SupraContractsBindingsCalls::getTaskDetails) + .map(SupraContractsBindingsCalls::ifTaskExists) } - getTaskDetails + ifTaskExists }, { - fn getAllActiveTaskIds( + fn getTaskDetails( data: &[u8], ) -> alloy_sol_types::Result { - ::abi_decode_raw_validate( + ::abi_decode_raw_validate( data, ) - .map(SupraContractsBindingsCalls::getAllActiveTaskIds) + .map(SupraContractsBindingsCalls::getTaskDetails) } - getAllActiveTaskIds + getTaskDetails }, { fn isAutomationEnabled( @@ -3522,8 +3757,8 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external inner, ) } - Self::getAllActiveTaskIds(inner) => { - ::abi_encoded_size( + Self::getActiveTaskIds(inner) => { + ::abi_encoded_size( inner, ) } @@ -3547,6 +3782,11 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external inner, ) } + Self::ifTaskExists(inner) => { + ::abi_encoded_size( + inner, + ) + } Self::isAutomationEnabled(inner) => { ::abi_encoded_size( inner, @@ -3568,8 +3808,8 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external out, ) } - Self::getAllActiveTaskIds(inner) => { - ::abi_encode_raw( + Self::getActiveTaskIds(inner) => { + ::abi_encode_raw( inner, out, ) @@ -3598,6 +3838,12 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external out, ) } + Self::ifTaskExists(inner) => { + ::abi_encode_raw( + inner, + out, + ) + } Self::isAutomationEnabled(inner) => { ::abi_encode_raw( inner, @@ -3876,11 +4122,11 @@ the bytecode concatenated with the constructor's ABI-encoded arguments.*/ ) -> alloy_contract::SolCallBuilder<&P, blockPrologueCall, N> { self.call_builder(&blockPrologueCall) } - ///Creates a new call builder for the [`getAllActiveTaskIds`] function. - pub fn getAllActiveTaskIds( + ///Creates a new call builder for the [`getActiveTaskIds`] function. + pub fn getActiveTaskIds( &self, - ) -> alloy_contract::SolCallBuilder<&P, getAllActiveTaskIdsCall, N> { - self.call_builder(&getAllActiveTaskIdsCall) + ) -> alloy_contract::SolCallBuilder<&P, getActiveTaskIdsCall, N> { + self.call_builder(&getActiveTaskIdsCall) } ///Creates a new call builder for the [`getCycleStateDetails`] function. pub fn getCycleStateDetails( @@ -3912,6 +4158,13 @@ the bytecode concatenated with the constructor's ABI-encoded arguments.*/ ) -> alloy_contract::SolCallBuilder<&P, getTaskIdListCall, N> { self.call_builder(&getTaskIdListCall) } + ///Creates a new call builder for the [`ifTaskExists`] function. + pub fn ifTaskExists( + &self, + _taskIndex: u64, + ) -> alloy_contract::SolCallBuilder<&P, ifTaskExistsCall, N> { + self.call_builder(&ifTaskExistsCall { _taskIndex }) + } ///Creates a new call builder for the [`isAutomationEnabled`] function. pub fn isAutomationEnabled( &self, diff --git a/crates/supra-extension/src/transactions/automated_transaction.rs b/crates/supra-extension/src/transactions/automated_transaction.rs index 541557c9f0..4c313a5f9e 100644 --- a/crates/supra-extension/src/transactions/automated_transaction.rs +++ b/crates/supra-extension/src/transactions/automated_transaction.rs @@ -1,8 +1,8 @@ //! AutomatedTransaction generated based on the registered active automation task. use crate::errors::SupraExtensionError; -use crate::supra_contract_bindings::supra_contracts_bindings::CommonUtils::TaskDetails; use crate::value_or_error; +use crate::TaskMetadata; use alloy::eips::eip2930::AccessList; use alloy::primitives::{Address, Bytes, ChainId, B256, U256}; use alloy_consensus::transaction::Transaction; @@ -243,7 +243,19 @@ type ExpandedPayloadTy = ( ); /// Evm automation task execution payload. -#[derive(Clone, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize, Getters, Dissolve, Constructor)] +#[derive( + Clone, + Debug, + Default, + PartialEq, + Eq, + Hash, + Serialize, + Deserialize, + Getters, + Dissolve, + Constructor, +)] pub struct TaskPayload { to: Address, value: U256, @@ -252,7 +264,6 @@ pub struct TaskPayload { } impl TaskPayload { - /// Generates random [`TaskPayload`] for testing propose only. pub fn random() -> Self { TaskPayload { @@ -262,7 +273,6 @@ impl TaskPayload { access_list: AccessList::default(), } } - } impl TryFrom<&[u8]> for TaskPayload { @@ -503,11 +513,11 @@ impl AutomatedTransactionBuilder { /// Fails if: /// - inner payload cannot be deserialized based on the [`ExpandedPayloadTy`] schema /// - Loaded task is not in active state (Active | Cancelled) -impl TryFrom for AutomatedTransactionBuilder { +impl TryFrom for AutomatedTransactionBuilder { type Error = SupraExtensionError; - fn try_from(value: TaskDetails) -> Result { - let TaskDetails { + fn try_from(value: TaskMetadata) -> Result { + let TaskMetadata { maxGasAmount, gasPriceCap, automationFeeCapForCycle: _, @@ -519,12 +529,14 @@ impl TryFrom for AutomatedTransactionBuilder { priority, taskType, owner, - state, + taskState, payloadTx, + // TODO: handle predicate + predicate: _, auxData: _, } = value; - if AutomationTaskState::try_from(state)? == AutomationTaskState::Pending { + if AutomationTaskState::try_from(taskState)? == AutomationTaskState::Pending { return Err(SupraExtensionError::InvalidAutomationTaskStateForBuilder); } let typ = AutomatedTransactionType::try_from(taskType)?; diff --git a/crates/supra-extension/src/transactions/automation_record.rs b/crates/supra-extension/src/transactions/automation_record.rs index 309bb37728..6e4a1c31af 100644 --- a/crates/supra-extension/src/transactions/automation_record.rs +++ b/crates/supra-extension/src/transactions/automation_record.rs @@ -1,6 +1,6 @@ //! Automation registry transaction record definition to assist automation bookkeeping. use crate::errors::SupraExtensionError; -use crate::supra_contract_bindings::supra_contracts_bindings::SupraContractsBindings::processTasksCall; +use crate::processTasksCall; use crate::value_or_error; use alloy::eips::eip2930::AccessList; use alloy::primitives::{Address, Bytes, ChainId, TxKind, B256, U256}; diff --git a/crates/supra-extension/src/transactions/block_metadata.rs b/crates/supra-extension/src/transactions/block_metadata.rs index 77b7f7fa53..ac72b2fdbd 100644 --- a/crates/supra-extension/src/transactions/block_metadata.rs +++ b/crates/supra-extension/src/transactions/block_metadata.rs @@ -2,7 +2,7 @@ //! to aid block based checks to assist chain regular operations use crate::errors::SupraExtensionError; -use crate::supra_contract_bindings::supra_contracts_bindings::SupraContractsBindings::blockPrologueCall; +use crate::blockPrologueCall; use crate::value_or_error; use alloy::primitives::{Address, Bytes, ChainId, B256, U256}; use alloy_consensus::transaction::Transaction; diff --git a/solidity/supra_contracts/foundry.toml b/solidity/supra_contracts/foundry.toml index b1b1fa7da9..4994e0fd18 100644 --- a/solidity/supra_contracts/foundry.toml +++ b/solidity/supra_contracts/foundry.toml @@ -4,9 +4,12 @@ out = "out" libs = ["lib"] via_ir = true optimizer = true +evm_version = "prague" # Uncomment when running agains supra chain -# eth_rpc_url = "http://localhost:27000/rpc/v1/eth/wallet_integration" +#eth_rpc_url = "http://localhost:27000/rpc/v1/eth/wallet_integration" + +remappings = ["@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/"] # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options diff --git a/solidity/supra_contracts/src/SupraContractsBindings.sol b/solidity/supra_contracts/src/SupraContractsBindings.sol index c2ab613946..718b0969dc 100644 --- a/solidity/supra_contracts/src/SupraContractsBindings.sol +++ b/solidity/supra_contracts/src/SupraContractsBindings.sol @@ -15,8 +15,7 @@ interface SupraContractsBindings { // View functions of CoreFacet function isAutomationEnabled() external view returns (bool); - function getCycleInfo() external view returns (uint64, uint64, uint64, LibCommon.CycleState); - function getTransitionInfo() external view returns (uint64, uint128); + function getCycleStateDetails() external view returns (LibCommon.CycleDetails memory); // Entry function to be called by node runtime for bookkeeping function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external; diff --git a/solidity/supra_contracts/src/facets/CoreFacet.sol b/solidity/supra_contracts/src/facets/CoreFacet.sol index fbe7abdd55..e9f02f9e15 100644 --- a/solidity/supra_contracts/src/facets/CoreFacet.sol +++ b/solidity/supra_contracts/src/facets/CoreFacet.sol @@ -108,6 +108,17 @@ contract CoreFacet is ICoreFacet { return (transitionState.refundDuration, transitionState.automationFeePerSec); } + /// @notice Returns the index, start time, duration, state, transition details if any of the current cycle. + function getCycleStateDetails() external view returns (LibCommon.CycleDetails memory details) { + details.index = s.index; + details.startTime = s.startTime; + details.durationSecs = s.durationSecs; + details.state = s.cycleState; + TransitionState storage transitionState = LibAppStorage.transitionState(); + details.nextTaskIndexPosition = transitionState.nextTaskIndexPosition; + details.expectedTasksToBeProcessed = LibUtils.uintSetToUint64Array(transitionState.expectedTasksToBeProcessed); + } + /// @notice Returns if automation is enabled. function isAutomationEnabled() external view returns (bool) { return s.automationEnabled; diff --git a/solidity/supra_contracts/src/libraries/LibCommon.sol b/solidity/supra_contracts/src/libraries/LibCommon.sol index 52b2b091b3..1a5cb49565 100644 --- a/solidity/supra_contracts/src/libraries/LibCommon.sol +++ b/solidity/supra_contracts/src/libraries/LibCommon.sol @@ -6,7 +6,16 @@ import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet library LibCommon { using EnumerableSet for EnumerableSet.UintSet; - + + struct CycleDetails { + uint64 index; + uint64 startTime; + uint64 durationSecs; + LibCommon.CycleState state; + uint64 nextTaskIndexPosition; + uint64[] expectedTasksToBeProcessed; + } + /// @notice Enum describing state of the cycle. enum CycleState { READY, diff --git a/solidity/supra_contracts/src/libraries/LibUtils.sol b/solidity/supra_contracts/src/libraries/LibUtils.sol index b7f9ceb30b..6a6f757e57 100644 --- a/solidity/supra_contracts/src/libraries/LibUtils.sol +++ b/solidity/supra_contracts/src/libraries/LibUtils.sol @@ -1,5 +1,6 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.27; +import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; // Helper library used by Supra contracts library LibUtils { @@ -55,4 +56,15 @@ library LibUtils { uint160 addr = uint160(_addr); return addr >= uint160(VM_SIGNER) && addr <= uint160(0x535550FF); } + + /// @notice Converts an EnumerableSet.UintSet to a uint64 array. + /// @param set The UintSet to convert. + /// @return result The values as a uint64 array. + function uintSetToUint64Array(EnumerableSet.UintSet storage set) internal view returns (uint64[] memory result) { + uint256 length = EnumerableSet.length(set); + result = new uint64[](length); + for (uint256 i = 0; i < length; i++) { + result[i] = uint64(EnumerableSet.at(set, i)); + } + } } From 6f739b0f8435cc0ce9a39bf05b20742f19241c26 Mon Sep 17 00:00:00 2001 From: Aregnaz Harutyunyan <> Date: Thu, 16 Apr 2026 12:16:31 +0400 Subject: [PATCH 2/4] Updated Diamond initialization logic to be part of the contract constructor - This allows to not have any extra action to be done after the contract is deployed during genesis - Fixed the tests accordingly - Updated genesis transaction generation flow accordingly --- Cargo.lock | 2462 +++++++---------- .../src/contracts/generator.rs | 178 +- .../src/contracts/transaction.rs | 29 +- .../src/supra_contract_bindings/mod.rs | 2 +- .../supra_contracts_bindings.rs | 87 +- .../src/transactions/automation_record.rs | 2 +- .../script/DeployDiamond.s.sol | 21 +- .../supra_contracts/script/GovActions.s.sol | 8 +- .../script/MintErc20Supra.s.sol | 5 +- .../script/RegisterAutomationTask.s.sol | 9 +- solidity/supra_contracts/src/Diamond.sol | 121 +- .../src/SupraContractsBindings.sol | 2 +- .../src/facets/ConfigFacet.sol | 20 +- .../supra_contracts/src/facets/CoreFacet.sol | 19 +- .../src/facets/DiamondLoupeFacet.sol | 13 +- .../src/facets/OwnershipFacet.sol | 10 +- .../src/facets/RegistryFacet.sol | 43 +- .../src/interfaces/IFacetSelectors.sol | 8 + .../src/libraries/DiamondTypes.sol | 29 + .../src/libraries/LibDiamondUtils.sol | 259 +- .../src/upgradeInitializers/DiamondInit.sol | 1 + .../test/BaseDiamondTest.t.sol | 3 +- solidity/supra_contracts/test/CoreFacet.t.sol | 3 +- .../supra_contracts/test/DiamondInit.t.sol | 111 +- 24 files changed, 1447 insertions(+), 1998 deletions(-) create mode 100644 solidity/supra_contracts/src/interfaces/IFacetSelectors.sol create mode 100644 solidity/supra_contracts/src/libraries/DiamondTypes.sol diff --git a/Cargo.lock b/Cargo.lock index 8414e40505..5aa06e95e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 4 [[package]] name = "addchain" -version = "0.2.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e33f6a175ec6a9e0aca777567f9ff7c3deefc255660df887e7fa3585e9801d8" +checksum = "3b2e69442aa5628ea6951fa33e24efe8313f4321a91bd729fc2f75bdfc858570" dependencies = [ "num-bigint 0.3.3", "num-integer", @@ -26,7 +26,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", - "getrandom 0.3.4", + "getrandom 0.3.3", "once_cell", "version_check", "zerocopy", @@ -34,9 +34,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.4" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -49,9 +49,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50ab0cd8afe573d1f7dc2353698a51b1f93aec362c8211e28cfd3948c6adba39" +checksum = "f07655fedc35188f3c50ff8fc6ee45703ae14ef1bc7ae7d80e23a747012184e3" dependencies = [ "alloy-consensus", "alloy-contract", @@ -72,9 +72,9 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.2.34" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84e0378e959aa6a885897522080a990e80eb317f1e9a222a604492ea50e13096" +checksum = "35d744058a9daa51a8cf22a3009607498fcf82d3cf4c5444dd8056cdf651f471" dependencies = [ "alloy-primitives", "num_enum", @@ -84,9 +84,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f16daaf7e1f95f62c6c3bf8a3fc3d78b08ae9777810c0bb5e94966c7cd57ef0" +checksum = "2e318e25fb719e747a7e8db1654170fc185024f3ed5b10f86c08d448a912f6e2" dependencies = [ "alloy-eips", "alloy-primitives", @@ -106,14 +106,14 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror 2.0.18", + "thiserror 2.0.17", ] [[package]] name = "alloy-consensus-any" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "118998d9015332ab1b4720ae1f1e3009491966a0349938a1f43ff45a8a4c6299" +checksum = "364380a845193a317bcb7a5398fc86cdb66c47ebe010771dde05f6869bf9e64a" dependencies = [ "alloy-consensus", "alloy-eips", @@ -125,9 +125,9 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ac9e0c34dc6bce643b182049cdfcca1b8ce7d9c260cbdd561f511873b7e26cd" +checksum = "08d39c80ffc806f27a76ed42f3351a455f3dc4f81d6ff92c8aad2cf36b7d3a34" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -142,15 +142,14 @@ dependencies = [ "futures", "futures-util", "serde_json", - "thiserror 2.0.18", - "tracing", + "thiserror 2.0.17", ] [[package]] name = "alloy-core" -version = "1.5.7" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e8604b0c092fabc80d075ede181c9b9e596249c70b99253082d7e689836529" +checksum = "2a651e1d9e50e6d0a78bd23cd08facb70459a94501c4036c7799a093e569a310" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -161,9 +160,9 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "1.5.7" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2db5c583aaef0255aa63a4fe827f826090142528bba48d1bf4119b62780cad" +checksum = "0d48a9101f4a67c22fae57489f1ddf3057b8ab4a368d8eac3be088b6e9d9c9d9" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -172,7 +171,7 @@ dependencies = [ "itoa", "serde", "serde_json", - "winnow 0.7.15", + "winnow", ] [[package]] @@ -185,7 +184,7 @@ dependencies = [ "alloy-rlp", "crc", "serde", - "thiserror 2.0.18", + "thiserror 2.0.17", ] [[package]] @@ -211,31 +210,18 @@ dependencies = [ "borsh", "k256", "serde", - "thiserror 2.0.18", -] - -[[package]] -name = "alloy-eip7928" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8222b1d88f9a6d03be84b0f5e76bb60cd83991b43ad8ab6477f0e4a7809b98d" -dependencies = [ - "alloy-primitives", - "alloy-rlp", - "borsh", - "serde", + "thiserror 2.0.17", ] [[package]] name = "alloy-eips" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ef28c9fdad22d4eec52d894f5f2673a0895f1e5ef196734568e68c0f6caca8" +checksum = "a4c4d7c5839d9f3a467900c625416b24328450c65702eb3d8caff8813e4d1d33" dependencies = [ "alloy-eip2124", "alloy-eip2930", "alloy-eip7702", - "alloy-eip7928", "alloy-primitives", "alloy-rlp", "alloy-serde", @@ -247,13 +233,14 @@ dependencies = [ "serde", "serde_with", "sha2 0.10.9", + "thiserror 2.0.17", ] [[package]] name = "alloy-genesis" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf9480307b09d22876efb67d30cadd9013134c21f3a17ec9f93fd7536d38024" +checksum = "1ba4b1be0988c11f0095a2380aa596e35533276b8fa6c9e06961bbfe0aebcac5" dependencies = [ "alloy-eips", "alloy-primitives", @@ -266,9 +253,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "1.5.7" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dbe713da0c737d9e5e387b0ba790eb98b14dd207fe53eef50e19a5a8ec3dac" +checksum = "9914c147bb9b25f440eca68a31dc29f5c22298bfa7754aa802965695384122b0" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -278,24 +265,24 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422d110f1c40f1f8d0e5562b0b649c35f345fccb7093d9f02729943dcd1eef71" +checksum = "f72cf87cda808e593381fb9f005ffa4d2475552b7a6c5ac33d087bf77d82abd0" dependencies = [ "alloy-primitives", "alloy-sol-types", "http", "serde", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.17", "tracing", ] [[package]] name = "alloy-network" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7197a66d94c4de1591cdc16a9bcea5f8cccd0da81b865b49aef97b1b4016e0fa" +checksum = "12aeb37b6f2e61b93b1c3d34d01ee720207c76fe447e2a2c217e433ac75b17f5" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -314,14 +301,14 @@ dependencies = [ "futures-utils-wasm", "serde", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.17", ] [[package]] name = "alloy-network-primitives" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb82711d59a43fdfd79727c99f270b974c784ec4eb5728a0d0d22f26716c87ef" +checksum = "abd29ace62872083e30929cd9b282d82723196d196db589f3ceda67edcc05552" dependencies = [ "alloy-consensus", "alloy-eips", @@ -332,9 +319,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "1.5.7" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3b431b4e72cd8bd0ec7a50b4be18e73dab74de0dba180eef171055e5d5926e" +checksum = "7db950a29746be9e2f2c6288c8bd7a6202a81f999ce109a2933d2379970ec0fa" dependencies = [ "alloy-rlp", "arbitrary", @@ -343,28 +330,29 @@ dependencies = [ "const-hex", "derive_more", "foldhash 0.2.0", - "getrandom 0.4.2", + "getrandom 0.3.3", "hashbrown 0.16.1", - "indexmap 2.14.0", + "indexmap 2.12.1", "itoa", "k256", "keccak-asm", "paste", "proptest", "proptest-derive", - "rand 0.9.4", + "rand 0.9.1", "rapidhash", "ruint", "rustc-hash", "serde", "sha3", + "tiny-keccak", ] [[package]] name = "alloy-provider" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf6b18b929ef1d078b834c3631e9c925177f3b23ddc6fa08a722d13047205876" +checksum = "9b710636d7126e08003b8217e24c09f0cca0b46d62f650a841736891b1ed1fc1" dependencies = [ "alloy-chains", "alloy-consensus", @@ -389,10 +377,10 @@ dependencies = [ "lru", "parking_lot", "pin-project", - "reqwest 0.13.2", + "reqwest", "serde", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.17", "tokio", "tracing", "url", @@ -401,9 +389,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.15" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc90b1e703d3c03f4ff7f48e82dd0bc1c8211ab7d079cd836a06fcfeb06651cb" +checksum = "5f70d83b765fdc080dbcd4f4db70d8d23fe4761f2f02ebfa9146b833900634b4" dependencies = [ "alloy-rlp-derive", "arrayvec", @@ -412,20 +400,20 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.15" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36834a5c0a2fa56e171bf256c34d70fca07d0c0031583edea1c4946b7889c9e" +checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "alloy-rpc-client" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fcc9604042ca80bd37aa5e232ea1cd851f337e31e2babbbb345bc0b1c30de3" +checksum = "d0882e72d2c1c0c79dcf4ab60a67472d3f009a949f774d4c17d0bdb669cfde05" dependencies = [ "alloy-json-rpc", "alloy-primitives", @@ -433,7 +421,7 @@ dependencies = [ "alloy-transport-http", "futures", "pin-project", - "reqwest 0.13.2", + "reqwest", "serde", "serde_json", "tokio", @@ -446,9 +434,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4faad925d3a669ffc15f43b3deec7fbdf2adeb28a4d6f9cf4bc661698c0f8f4b" +checksum = "39cf1398cb33aacb139a960fa3d8cf8b1202079f320e77e952a0b95967bf7a9f" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -458,9 +446,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3823026d1ed239a40f12364fac50726c8daf1b6ab8077a97212c5123910429ed" +checksum = "6a63fb40ed24e4c92505f488f9dd256e2afaed17faa1b7a221086ebba74f4122" dependencies = [ "alloy-consensus-any", "alloy-rpc-types-eth", @@ -469,9 +457,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c095f92c4e1ff4981d89e9aa02d5f98c762a1980ab66bec49c44be11349da2" +checksum = "9eae0c7c40da20684548cbc8577b6b7447f7bf4ddbac363df95e3da220e41e72" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -485,14 +473,14 @@ dependencies = [ "serde", "serde_json", "serde_with", - "thiserror 2.0.18", + "thiserror 2.0.17", ] [[package]] name = "alloy-serde" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ece63b89294b8614ab3f483560c08d016930f842bf36da56bf0b764a15c11e" +checksum = "c0df1987ed0ff2d0159d76b52e7ddfc4e4fbddacc54d2fbee765e0d14d7c01b5" dependencies = [ "alloy-primitives", "serde", @@ -501,9 +489,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f447aefab0f1c0649f71edc33f590992d4e122bc35fb9cdbbf67d4421ace85" +checksum = "6ff69deedee7232d7ce5330259025b868c5e6a52fa8dffda2c861fb3a5889b24" dependencies = [ "alloy-primitives", "async-trait", @@ -511,14 +499,14 @@ dependencies = [ "either", "elliptic-curve", "k256", - "thiserror 2.0.18", + "thiserror 2.0.17", ] [[package]] name = "alloy-signer-local" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f721f4bf2e4812e5505aaf5de16ef3065a8e26b9139ac885862d00b5a55a659a" +checksum = "72cfe0be3ec5a8c1a46b2e5a7047ed41121d360d97f4405bb7c1c784880c86cb" dependencies = [ "alloy-consensus", "alloy-network", @@ -527,47 +515,47 @@ dependencies = [ "async-trait", "k256", "rand 0.8.5", - "thiserror 2.0.18", + "thiserror 2.0.17", ] [[package]] name = "alloy-sol-macro" -version = "1.5.7" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab81bab693da9bb79f7a95b64b394718259fdd7e41dceeced4cad57cb71c4f6a" +checksum = "a3b96d5f5890605ba9907ce1e2158e2701587631dc005bfa582cf92dd6f21147" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "alloy-sol-macro-expander" -version = "1.5.7" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489f1620bb7e2483fb5819ed01ab6edc1d2f93939dce35a5695085a1afd1d699" +checksum = "b8247b7cca5cde556e93f8b3882b01dbd272f527836049083d240c57bf7b4c15" dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", "const-hex", "heck", - "indexmap 2.14.0", + "indexmap 2.12.1", "proc-macro-error2", "proc-macro2", "quote", - "sha3", - "syn 2.0.117", + "syn 2.0.103", "syn-solidity", + "tiny-keccak", ] [[package]] name = "alloy-sol-macro-input" -version = "1.5.7" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56cef806ad22d4392c5fc83cf8f2089f988eb99c7067b4e0c6f1971fc1cca318" +checksum = "3cd54f38512ac7bae10bbc38480eefb1b9b398ca2ce25db9cc0c048c6411c4f1" dependencies = [ "alloy-json-abi", "const-hex", @@ -577,25 +565,25 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.117", + "syn 2.0.103", "syn-solidity", ] [[package]] name = "alloy-sol-type-parser" -version = "1.5.7" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6df77fea9d6a2a75c0ef8d2acbdfd92286cc599983d3175ccdc170d3433d249" +checksum = "444b09815b44899564566d4d56613d14fa9a274b1043a021f00468568752f449" dependencies = [ "serde", - "winnow 0.7.15", + "winnow", ] [[package]] name = "alloy-sol-types" -version = "1.5.7" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64612d29379782a5dde6f4b6570d9c756d734d760c0c94c254d361e678a6591f" +checksum = "dc1038284171df8bfd48befc0c7b78f667a7e2be162f45f07bd1c378078ebe58" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -605,9 +593,9 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8098f965442a9feb620965ba4b4be5e2b320f4ec5a3fff6bfa9e1ff7ef42bed1" +checksum = "be98b07210d24acf5b793c99b759e9a696e4a2e67593aec0487ae3b3e1a2478c" dependencies = [ "alloy-json-rpc", "auto_impl", @@ -618,7 +606,7 @@ dependencies = [ "parking_lot", "serde", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.17", "tokio", "tower", "tracing", @@ -628,14 +616,13 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8597d36d546e1dab822345ad563243ec3920e199322cb554ce56c8ef1a1e2e7" +checksum = "4198a1ee82e562cab85e7f3d5921aab725d9bd154b6ad5017f82df1695877c97" dependencies = [ "alloy-json-rpc", "alloy-transport", - "itertools 0.14.0", - "reqwest 0.13.2", + "reqwest", "serde_json", "tower", "tracing", @@ -644,30 +631,30 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.9.5" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f14b5d9b2c2173980202c6ff470d96e7c5e202c65a9f67884ad565226df7fbb" +checksum = "e3412d52bb97c6c6cc27ccc28d4e6e8cf605469101193b50b0bd5813b1f990b5" dependencies = [ "alloy-primitives", "alloy-rlp", + "arrayvec", "derive_more", "nybbles", "serde", "smallvec", - "thiserror 2.0.18", "tracing", ] [[package]] name = "alloy-tx-macros" -version = "1.8.3" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d69722eddcdf1ce096c3ab66cf8116999363f734eb36fe94a148f4f71c85da84" +checksum = "333544408503f42d7d3792bfc0f7218b643d968a03d2c0ed383ae558fb4a76d0" dependencies = [ - "darling", + "darling 0.21.3", "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -687,9 +674,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "annotate-snippets" -version = "0.12.15" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92570a3f9c98e7e84df84b71d0965ac99b1871fcd75a3773a3bd1bad13f64cf7" +checksum = "96401ca08501972288ecbcde33902fce858bf73fbcbdf91dab8c3a9544e106bb" dependencies = [ "anstyle", "memchr", @@ -698,27 +685,12 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" -dependencies = [ - "anstyle", - "anstyle-parse 0.2.7", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstream" -version = "1.0.0" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" +checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" dependencies = [ "anstyle", - "anstyle-parse 1.0.0", + "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", @@ -741,46 +713,37 @@ dependencies = [ "utf8parse", ] -[[package]] -name = "anstyle-parse" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" -dependencies = [ - "utf8parse", -] - [[package]] name = "anstyle-query" -version = "1.1.5" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" +checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.11" +version = "3.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" +checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.102" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" [[package]] name = "arbitrary" -version = "1.4.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" +checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" dependencies = [ "derive_arbitrary", ] @@ -822,7 +785,7 @@ dependencies = [ "ark-std 0.5.0", "educe", "fnv", - "hashbrown 0.15.5", + "hashbrown 0.15.4", "itertools 0.13.0", "num-bigint 0.4.6", "num-integer", @@ -915,7 +878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" dependencies = [ "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -953,7 +916,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -968,7 +931,7 @@ dependencies = [ "ark-std 0.5.0", "educe", "fnv", - "hashbrown 0.15.5", + "hashbrown 0.15.4", ] [[package]] @@ -1042,7 +1005,7 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -1086,6 +1049,9 @@ name = "arrayvec" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +dependencies = [ + "serde", +] [[package]] name = "async-stream" @@ -1106,18 +1072,18 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "async-trait" -version = "0.1.89" +version = "0.1.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -1153,7 +1119,7 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -1162,33 +1128,11 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" -[[package]] -name = "aws-lc-rs" -version = "1.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a054912289d18629dc78375ba2c3726a3afe3ff71b4edba9dedfca0e3446d1fc" -dependencies = [ - "aws-lc-sys", - "zeroize", -] - -[[package]] -name = "aws-lc-sys" -version = "0.39.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a25cf98105baa966497416dbd42565ce3a8cf8dbfd59803ec9ad46f3126399" -dependencies = [ - "cc", - "cmake", - "dunce", - "fs_extra", -] - [[package]] name = "az" -version = "1.3.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5eb007b7cacc6c660343e96f650fedf4b5a77512399eb952ca6642cf8d13f7" +checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "base16ct" @@ -1204,9 +1148,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.8.3" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" +checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" [[package]] name = "bincode" @@ -1254,15 +1198,15 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitcoin-io" -version = "0.1.4" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dee39a0ee5b4095224a0cfc6bf4cc1baf0f9624b96b367e53b66d974e51d953" +checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf" [[package]] name = "bitcoin_hashes" -version = "0.14.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26ec84b80c482df901772e931a9a681e26a1b9ee2302edeff23cb30328745c8b" +checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" dependencies = [ "bitcoin-io", "hex-conservative", @@ -1270,11 +1214,11 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.11.1" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" dependencies = [ - "serde_core", + "serde", ] [[package]] @@ -1290,38 +1234,17 @@ dependencies = [ "wyz", ] -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "blake2b_simd" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b79834656f71332577234b50bfc009996f7449e0c056884e6a02492ded0ca2f3" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - [[package]] name = "blake3" -version = "1.8.4" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d2d5991425dfd0785aed03aedcf0b321d61975c9b5b3689c774a2610ae0b51e" +checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "cpufeatures 0.3.0", ] [[package]] @@ -1342,24 +1265,11 @@ dependencies = [ "generic-array", ] -[[package]] -name = "bls12_381" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3c196a77437e7cc2fb515ce413a6401291578b5afc8ecb29a3c7ab957f05941" -dependencies = [ - "ff 0.12.1", - "group 0.12.1", - "pairing 0.22.0", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "blst" -version = "0.3.16" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdb4c7013139a150f9fc55d123186dbfaba0d912817466282c73ac49e71fb45" +checksum = "4fd49896f12ac9b6dcd7a5998466b9b58263a695a3dd1ecc1aaca2e12a90b080" dependencies = [ "cc", "glob", @@ -1383,37 +1293,36 @@ version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "519bd3116aeeb42d5372c29d982d16d0170d3d4a5ed85fc7dd91642ffff3c67c" dependencies = [ - "darling", + "darling 0.21.3", "ident_case", "prettyplease", "proc-macro2", "quote", "rustversion", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "borsh" -version = "1.6.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd1e3f8955a5d7de9fab72fc8373fade9fb8a703968cb200ae3dc6cf08e185a" +checksum = "d1da5ab77c1437701eeff7c88d968729e7766172279eab0676857b3d63af7a6f" dependencies = [ "borsh-derive", - "bytes", "cfg_aliases", ] [[package]] name = "borsh-derive" -version = "1.6.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfcfdc083699101d5a7965e49925975f2f55060f94f9a05e7187be95d530ca59" +checksum = "0686c856aa6aac0c4498f936d7d6a02df690f614c03e4d906d1018062b5c5e2c" dependencies = [ "once_cell", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -1434,9 +1343,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.20.2" +version = "3.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" +checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" [[package]] name = "byte-slice-cast" @@ -1458,18 +1367,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.11.1" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" dependencies = [ "serde", ] [[package]] name = "c-kzg" -version = "2.1.7" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6648ed1e4ea8e8a1a4a2c78e1cda29a3fd500bc622899c340d8525ea9a76b24a" +checksum = "7318cfa722931cb5fe0838b98d3ce5621e75f6a6408abc21721d80de9223f2e4" dependencies = [ "blst", "cc", @@ -1488,27 +1397,19 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.60" +version = "1.2.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43c5703da9466b66a946814e1adf53ea2c90f10063b86290cc9eb67ce3478a20" +checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215" dependencies = [ "find-msvc-tools", - "jobserver", - "libc", "shlex", ] -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - [[package]] name = "cfg-if" -version = "1.0.4" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" [[package]] name = "cfg_aliases" @@ -1518,14 +1419,14 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.44" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ "iana-time-zone", "num-traits", "serde", - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -1557,9 +1458,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.0" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351" +checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f" dependencies = [ "clap_builder", "clap_derive", @@ -1567,11 +1468,11 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.6.0" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" +checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e" dependencies = [ - "anstream 1.0.0", + "anstream", "anstyle", "clap_lex", "strsim", @@ -1579,30 +1480,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.0" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a" +checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "clap_lex" -version = "1.1.0" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" - -[[package]] -name = "cmake" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" -dependencies = [ - "cc", -] +checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" [[package]] name = "codspeed" @@ -1657,9 +1549,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.5" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "colored" @@ -1671,16 +1563,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - [[package]] name = "console" version = "0.15.11" @@ -1696,14 +1578,15 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.18.1" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531185e432bb31db1ecda541e9e7ab21468d4d844ad7505e0546a49b4945d49b" +checksum = "83e22e0ed40b96a48d3db274f72fd365bd78f67af39b6bbd47e8a15e1c6207ff" dependencies = [ "cfg-if", - "cpufeatures 0.2.17", + "cpufeatures", + "hex", "proptest", - "serde_core", + "serde", ] [[package]] @@ -1714,9 +1597,9 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_format" -version = "0.2.35" +version = "0.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad" +checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" dependencies = [ "const_format_proc_macros", ] @@ -1734,15 +1617,15 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.4.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d52eff69cd5e647efe296129160853a42795992097e8af39800e1060caeea9b" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" -version = "0.10.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9" +checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7" dependencies = [ "unicode-segmentation", ] @@ -1782,20 +1665,11 @@ dependencies = [ "libc", ] -[[package]] -name = "cpufeatures" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" -dependencies = [ - "libc", -] - [[package]] name = "crc" -version = "3.4.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eb8a2a1cd12ab0d987a5d5e825195d372001a4094a0376319d5a0ad71c1ba0d" +checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" dependencies = [ "crc-catalog", ] @@ -1852,9 +1726,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.4" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" +checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" [[package]] name = "crypto-bigint" @@ -1880,58 +1754,94 @@ dependencies = [ [[package]] name = "csv" -version = "1.4.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" +checksum = "acdc4883a9c96732e4733212c01447ebd805833b7275a73ca3ee080fd77afdaf" dependencies = [ "csv-core", "itoa", "ryu", - "serde_core", + "serde", ] [[package]] name = "csv-core" -version = "0.1.13" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782" +checksum = "7d02f3b0da4c6504f86e9cd789d8dbafab48c2321be74e9987593de5a894d93d" dependencies = [ "memchr", ] [[package]] name = "darling" -version = "0.23.0" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" +dependencies = [ + "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 = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.21.3", + "darling_macro 0.21.3", ] [[package]] name = "darling_core" -version = "0.23.0" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.103", +] + +[[package]] +name = "darling_core" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" dependencies = [ + "fnv", "ident_case", "proc-macro2", "quote", "serde", "strsim", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "darling_macro" -version = "0.23.0" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" +dependencies = [ + "darling_core 0.20.11", + "quote", + "syn 2.0.103", +] + +[[package]] +name = "darling_macro" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ - "darling_core", + "darling_core 0.21.3", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -1987,51 +1897,50 @@ checksum = "74ef43543e701c01ad77d3a5922755c6a1d71b22d942cb8042be4994b380caff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "derive-where" -version = "1.6.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d08b3a0bcc0d079199cd476b2cae8435016ec11d1c0986c6901c5ac223041534" +checksum = "510c292c8cf384b1a340b816a9a6cf2599eb8f566a44949024af88418000c50b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "derive_arbitrary" -version = "1.4.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" +checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "derive_more" -version = "2.1.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" dependencies = [ "derive_more-impl", ] [[package]] name = "derive_more-impl" -version = "2.1.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version 0.4.1", - "syn 2.0.117", + "syn 2.0.103", "unicode-xid", ] @@ -2085,7 +1994,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -2096,9 +2005,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dyn-clone" -version = "1.0.20" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" +checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" [[package]] name = "ecdsa" @@ -2124,7 +2033,7 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -2136,12 +2045,6 @@ dependencies = [ "serde", ] -[[package]] -name = "elf" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4445909572dbd556c457c849c4ca58623d84b27c8fff1e74b0b4227d8b90d17b" - [[package]] name = "elliptic-curve" version = "0.13.8" @@ -2151,9 +2054,9 @@ dependencies = [ "base16ct", "crypto-bigint", "digest 0.10.7", - "ff 0.13.1", + "ff", "generic-array", - "group 0.13.0", + "group", "pkcs8", "rand_core 0.6.4", "sec1", @@ -2179,22 +2082,22 @@ dependencies = [ [[package]] name = "enum-ordinalize" -version = "4.3.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1091a7bb1f8f2c4b28f1fe2cef4980ca2d410a3d727d67ecc3178c9b0800f0" +checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" dependencies = [ "enum-ordinalize-derive", ] [[package]] name = "enum-ordinalize-derive" -version = "4.3.2" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631" +checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -2216,12 +2119,12 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.14" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" +checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -2274,7 +2177,7 @@ version = "0.0.0" dependencies = [ "auto_impl", "revm 29.0.0", - "thiserror 2.0.18", + "thiserror 2.0.17", ] [[package]] @@ -2331,9 +2234,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.4.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "fastrlp" @@ -2357,24 +2260,12 @@ dependencies = [ "bytes", ] -[[package]] -name = "ff" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" -dependencies = [ - "bitvec", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "ff" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" dependencies = [ - "bitvec", "byteorder", "ff_derive", "rand_core 0.6.4", @@ -2412,9 +2303,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.9" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" [[package]] name = "fixed-hash" @@ -2430,10 +2321,11 @@ dependencies = [ [[package]] name = "flate2" -version = "1.1.9" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" +checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369" dependencies = [ + "crc32fast", "miniz_oxide", "zlib-rs", ] @@ -2456,11 +2348,26 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" -version = "1.2.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -2475,11 +2382,11 @@ dependencies = [ "alloy-json-abi", "alloy-primitives", "foundry-compilers", - "reqwest 0.12.28", - "semver 1.0.28", + "reqwest", + "semver 1.0.26", "serde", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.17", "tracing", ] @@ -2499,16 +2406,16 @@ dependencies = [ "itertools 0.14.0", "path-slash", "rayon", - "semver 1.0.28", + "semver 1.0.26", "serde", "serde_json", "sha2 0.10.9", "solar-compiler", "svm-rs", "svm-rs-builds", - "thiserror 2.0.18", + "thiserror 2.0.17", "tracing", - "winnow 0.7.15", + "winnow", "yansi", ] @@ -2535,10 +2442,10 @@ dependencies = [ "path-slash", "rayon", "regex", - "semver 1.0.28", + "semver 1.0.26", "serde", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.17", "tracing", "yansi", ] @@ -2554,7 +2461,7 @@ dependencies = [ "foundry-compilers-artifacts-solc", "foundry-compilers-core", "path-slash", - "semver 1.0.28", + "semver 1.0.26", "serde", ] @@ -2569,11 +2476,11 @@ dependencies = [ "dunce", "path-slash", "regex", - "semver 1.0.28", + "semver 1.0.26", "serde", "serde_json", "svm-rs", - "thiserror 2.0.18", + "thiserror 2.0.17", "tokio", "walkdir", "xxhash-rust", @@ -2602,27 +2509,21 @@ dependencies = [ "path-slash", "rayon", "regex", - "reqwest 0.12.28", + "reqwest", "revm 29.0.1", - "semver 1.0.28", + "semver 1.0.26", "serde", "serde_json", "solar-compiler", "soldeer-core", - "thiserror 2.0.18", - "toml 0.9.12+spec-1.1.0", + "thiserror 2.0.17", + "toml 0.9.11+spec-1.1.0", "toml_edit 0.23.10+spec-1.0.0", "tracing", "walkdir", "yansi", ] -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "funty" version = "2.0.0" @@ -2631,9 +2532,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.32" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -2646,9 +2547,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.32" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2656,15 +2557,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.32" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.32" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -2673,32 +2574,32 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.32" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.32" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "futures-sink" -version = "0.3.32" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.32" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-timer" @@ -2708,9 +2609,9 @@ checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.32" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2720,6 +2621,7 @@ dependencies = [ "futures-task", "memchr", "pin-project-lite", + "pin-utils", "slab", ] @@ -2737,9 +2639,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", @@ -2748,49 +2650,36 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.17" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "js-sys", "libc", - "wasi", + "wasi 0.11.1+wasi-snapshot-preview1", "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.3.4" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", "js-sys", "libc", - "r-efi 5.3.0", - "wasip2", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", "wasm-bindgen", ] -[[package]] -name = "getrandom" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" -dependencies = [ - "cfg-if", - "libc", - "r-efi 6.0.0", - "wasip2", - "wasip3", -] - [[package]] name = "glob" -version = "0.3.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "globset" @@ -2807,24 +2696,12 @@ dependencies = [ [[package]] name = "gmp-mpfr-sys" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cfc928d8ff4ab3767a3674cf55f81186436fb6070866bb1443ffe65a640d2d6" +version = "1.6.8" +source = "git+ssh://git@github.com/Entropy-Foundation/gmp-mpfr-sys?branch=master#6d5c91968d809b692df0abdcc3d93ce3588ff7ad" dependencies = [ + "cc", "libc", - "windows-sys 0.61.2", -] - -[[package]] -name = "group" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" -dependencies = [ - "ff 0.12.1", - "memuse", - "rand_core 0.6.4", - "subtle", + "windows-sys 0.60.2", ] [[package]] @@ -2833,7 +2710,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff 0.13.1", + "ff", "rand_core 0.6.4", "subtle", ] @@ -2850,7 +2727,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.14.0", + "indexmap 2.12.1", "slab", "tokio", "tokio-util", @@ -2859,41 +2736,17 @@ dependencies = [ [[package]] name = "half" -version = "2.7.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" +checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" dependencies = [ "cfg-if", "crunchy", - "zerocopy", ] [[package]] -name = "halo2" -version = "0.1.0-beta.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a23c779b38253fe1538102da44ad5bd5378495a61d2c4ee18d64eaa61ae5995" -dependencies = [ - "halo2_proofs", -] - -[[package]] -name = "halo2_proofs" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e925780549adee8364c7f2b685c753f6f3df23bde520c67416e93bf615933760" -dependencies = [ - "blake2b_simd", - "ff 0.12.1", - "group 0.12.1", - "pasta_curves 0.4.1", - "rand_core 0.6.4", - "rayon", -] - -[[package]] -name = "hash-db" -version = "0.15.2" +name = "hash-db" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" @@ -2911,11 +2764,12 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hashbrown" -version = "0.15.5" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" dependencies = [ "allocator-api2", + "equivalent", "foldhash 0.1.5", ] @@ -2925,19 +2779,11 @@ version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ - "allocator-api2", - "equivalent", "foldhash 0.2.0", "serde", "serde_core", ] -[[package]] -name = "hashbrown" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" - [[package]] name = "heck" version = "0.5.0" @@ -2955,12 +2801,15 @@ name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +dependencies = [ + "serde", +] [[package]] name = "hex-conservative" -version = "0.2.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda06d18ac606267c40c04e41b9947729bf8b9efe74bd4e82b61a5f26a510b9f" +checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" dependencies = [ "arrayvec", ] @@ -2985,11 +2834,12 @@ dependencies = [ [[package]] name = "http" -version = "1.4.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" dependencies = [ "bytes", + "fnv", "itoa", ] @@ -3024,14 +2874,13 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "hyper" -version = "1.9.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca" +checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" dependencies = [ - "atomic-waker", "bytes", "futures-channel", - "futures-core", + "futures-util", "h2", "http", "http-body", @@ -3045,30 +2894,48 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.8" +version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2b52f86d1d4bc0d6b4e6826d960b1b333217e07d36b882dca570a5e1c48895b" +checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ "http", "hyper", "hyper-util", "rustls", "rustls-native-certs", + "rustls-pki-types", "tokio", "tokio-rustls", "tower-service", "webpki-roots", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + [[package]] name = "hyper-util" -version = "0.1.20" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" +checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb" dependencies = [ "base64", "bytes", "futures-channel", + "futures-core", "futures-util", "http", "http-body", @@ -3077,7 +2944,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2", + "socket2 0.5.10", "system-configuration", "tokio", "tower-service", @@ -3087,9 +2954,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.65" +version = "0.1.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3111,13 +2978,12 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" dependencies = [ "displaydoc", "potential_utf", - "utf8_iter", "yoke", "zerofrom", "zerovec", @@ -3125,9 +2991,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" dependencies = [ "displaydoc", "litemap", @@ -3138,10 +3004,11 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" dependencies = [ + "displaydoc", "icu_collections", "icu_normalizer_data", "icu_properties", @@ -3152,38 +3019,42 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" [[package]] name = "icu_properties" -version = "2.2.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" dependencies = [ + "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", "icu_provider", + "potential_utf", "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "2.2.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" [[package]] name = "icu_provider" -version = "2.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" dependencies = [ "displaydoc", "icu_locale_core", + "stable_deref_trait", + "tinystr", "writeable", "yoke", "zerofrom", @@ -3191,12 +3062,6 @@ dependencies = [ "zerovec", ] -[[package]] -name = "id-arena" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" - [[package]] name = "ident_case" version = "1.0.1" @@ -3205,9 +3070,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.1.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ "idna_adapter", "smallvec", @@ -3257,7 +3122,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -3285,13 +3150,13 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.14.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" +checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" dependencies = [ "arbitrary", "equivalent", - "hashbrown 0.17.0", + "hashbrown 0.16.1", "serde", "serde_core", ] @@ -3330,15 +3195,15 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.12.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "iri-string" -version = "0.7.12" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25e659a4bb38e810ebc252e53b5814ff908a8c58c2a9ce2fae1bbec24cbf4e20" +checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" dependencies = [ "memchr", "serde", @@ -3346,20 +3211,20 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.17" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" +checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] name = "is_terminal_polyfill" -version = "1.70.2" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -3399,63 +3264,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" - -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if", - "combine", - "jni-sys 0.3.1", - "log", - "thiserror 1.0.69", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258" -dependencies = [ - "jni-sys 0.4.1", -] - -[[package]] -name = "jni-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" -dependencies = [ - "jni-sys-macros", -] - -[[package]] -name = "jni-sys-macros" -version = "0.4.1" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" -dependencies = [ - "quote", - "syn 2.0.117", -] - -[[package]] -name = "jobserver" -version = "0.1.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" -dependencies = [ - "getrandom 0.3.4", - "libc", -] +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "js-sys" @@ -3469,20 +3280,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jubjub" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a575df5f985fe1cd5b2b05664ff6accfc46559032b954529fd225a2168d27b0f" -dependencies = [ - "bitvec", - "bls12_381", - "ff 0.12.1", - "group 0.12.1", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "k256" version = "0.13.4" @@ -3499,18 +3296,18 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.6" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ - "cpufeatures 0.2.17", + "cpufeatures", ] [[package]] name = "keccak-asm" -version = "0.1.6" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa468878266ad91431012b3e5ef1bf9b170eab22883503a318d46857afa4579a" +checksum = "505d1856a39b200489082f90d897c3f07c455563880bc5952e38eabf731c83b6" dependencies = [ "digest 0.10.7", "sha3-asm", @@ -3518,11 +3315,11 @@ dependencies = [ [[package]] name = "kzg-rs" -version = "0.2.8" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8b4f55c3dedcfaa8668de1dfc8469e7a32d441c28edf225ed1f566fb32977d" +checksum = "9201effeea3fcc93b587904ae2df9ce97e433184b9d6d299e9ebc9830a546636" dependencies = [ - "ff 0.13.1", + "ff", "hex", "serde_arrays", "sha2 0.10.9", @@ -3539,12 +3336,6 @@ dependencies = [ "spin", ] -[[package]] -name = "leb128fmt" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" - [[package]] name = "libc" version = "0.2.185" @@ -3553,16 +3344,17 @@ checksum = "52ff2c0fe9bc6cb6b14a0592c2ff4fa9ceb83eea9db979b0487cd054946a2b8f" [[package]] name = "libm" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libredox" -version = "0.1.16" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" +checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" dependencies = [ + "bitflags", "libc", ] @@ -3614,22 +3406,23 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.12.1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "litemap" -version = "0.8.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "lock_api" -version = "0.4.14" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" dependencies = [ + "autocfg", "scopeguard", ] @@ -3644,11 +3437,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.16.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39" +checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465" dependencies = [ - "hashbrown 0.16.1", + "hashbrown 0.15.4", ] [[package]] @@ -3665,20 +3458,14 @@ checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "memchr" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" - -[[package]] -name = "memuse" -version = "0.2.2" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d97bbf43eb4f088f8ca469930cde17fa036207c9a5e02ccc5107c4e8b17c964" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" [[package]] name = "mesc" @@ -3719,13 +3506,30 @@ dependencies = [ [[package]] name = "mio" -version = "1.2.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc", - "wasi", - "windows-sys 0.61.2", + "wasi 0.11.1+wasi-snapshot-preview1", + "windows-sys 0.59.0", +] + +[[package]] +name = "native-tls" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe 0.1.6", + "openssl-sys", + "schannel", + "security-framework 2.11.1", + "security-framework-sys", + "tempfile", ] [[package]] @@ -3837,24 +3641,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.6" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", - "rustversion", ] [[package]] name = "num_enum_derive" -version = "0.7.6" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -3865,9 +3668,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "nybbles" -version = "0.4.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d49ff0c0d00d4a502b39df9af3a525e1efeb14b9dabb5bb83335284c1309210" +checksum = "bfa11e84403164a9f12982ab728f3c67c6fd4ab5b5f0254ffc217bdbd3b28ab0" dependencies = [ "alloy-rlp", "cfg-if", @@ -3885,9 +3688,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "once_cell_polyfill" -version = "1.70.2" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" [[package]] name = "once_map" @@ -3927,12 +3730,56 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" +[[package]] +name = "openssl" +version = "0.10.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.103", +] + +[[package]] +name = "openssl-probe" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" + [[package]] name = "openssl-probe" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" +[[package]] +name = "openssl-sys" +version = "0.9.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "option-ext" version = "0.2.0" @@ -3952,39 +3799,25 @@ dependencies = [ ] [[package]] -name = "p3-bn254-fr" -version = "0.3.2-succinct" +name = "p3-baby-bear" +version = "0.2.3-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9abf208fbfe540d6e2a6caaa2a9a345b1c8cb23ffdcdfcc6987244525d4fc821" +checksum = "7521838ecab2ddf4f7bc4ceebad06ec02414729598485c1ada516c39900820e8" dependencies = [ - "ff 0.13.1", "num-bigint 0.4.6", "p3-field", + "p3-mds", "p3-poseidon2", "p3-symmetric", "rand 0.8.5", "serde", ] -[[package]] -name = "p3-challenger" -version = "0.3.2-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42b725b453bbb35117a1abf0ddfd900b0676063d6e4231e0fa6bb0d76018d8ad" -dependencies = [ - "p3-field", - "p3-maybe-rayon", - "p3-symmetric", - "p3-util", - "serde", - "tracing", -] - [[package]] name = "p3-dft" -version = "0.3.2-succinct" +version = "0.2.3-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a1f81101bff744b7ebba7f4497e917a2c6716d6e62736e4a56e555a2d98cb7" +checksum = "46414daedd796f1eefcdc1811c0484e4bced5729486b6eaba9521c572c76761a" dependencies = [ "p3-field", "p3-matrix", @@ -3995,9 +3828,9 @@ dependencies = [ [[package]] name = "p3-field" -version = "0.3.2-succinct" +version = "0.2.3-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36459d4acb03d08097d713f336c7393990bb489ab19920d4f68658c7a5c10968" +checksum = "48948a0516b349e9d1cdb95e7236a6ee010c44e68c5cc78b4b92bf1c4022a0d9" dependencies = [ "itertools 0.12.1", "num-bigint 0.4.6", @@ -4007,26 +3840,11 @@ dependencies = [ "serde", ] -[[package]] -name = "p3-koala-bear" -version = "0.3.2-succinct" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1f52bcb6be38bdc8fa6b38b3434d4eedd511f361d4249fd798c6a5ef817b40" -dependencies = [ - "num-bigint 0.4.6", - "p3-field", - "p3-mds", - "p3-poseidon2", - "p3-symmetric", - "rand 0.8.5", - "serde", -] - [[package]] name = "p3-matrix" -version = "0.3.2-succinct" +version = "0.2.3-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e9cd136a4095a25c41a9edfdcce2dfae58ef01639317813bdbbd5b55c583" +checksum = "3e4de3f373589477cb735ea58e125898ed20935e03664b4614c7fac258b3c42f" dependencies = [ "itertools 0.12.1", "p3-field", @@ -4039,15 +3857,15 @@ dependencies = [ [[package]] name = "p3-maybe-rayon" -version = "0.3.2-succinct" +version = "0.2.3-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e524d47a49fb4265611303339c4ef970d892817b006cc330dad18afb91e411b1" +checksum = "c3968ad1160310296eb04f91a5f4edfa38fe1d6b2b8cd6b5c64e6f9b7370979e" [[package]] name = "p3-mds" -version = "0.3.2-succinct" +version = "0.2.3-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6cb8edcb276033d43769a3725570c340d2ed6f35c3cca4cddeee07718fa376" +checksum = "2356b1ed0add6d5dfbf7a338ce534a6fde827374394a52cec16a0840af6e97c9" dependencies = [ "itertools 0.12.1", "p3-dft", @@ -4060,9 +3878,9 @@ dependencies = [ [[package]] name = "p3-poseidon2" -version = "0.3.2-succinct" +version = "0.2.3-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a26197df2097b98ab7038d59a01e1fe1a0f545e7e04aa9436b2454b1836654f" +checksum = "7da1eec7e1b6900581bedd95e76e1ef4975608dd55be9872c9d257a8a9651c3a" dependencies = [ "gcd", "p3-field", @@ -4074,9 +3892,9 @@ dependencies = [ [[package]] name = "p3-symmetric" -version = "0.3.2-succinct" +version = "0.2.3-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1d3b5202096bca57cde912fbbb9cbaedaf5ac7c42a924c7166b98709d64d21" +checksum = "edb439bea1d822623b41ff4b51e3309e80d13cadf8b86d16ffd5e6efb9fdc360" dependencies = [ "itertools 0.12.1", "p3-field", @@ -4085,29 +3903,20 @@ dependencies = [ [[package]] name = "p3-util" -version = "0.3.2-succinct" +version = "0.2.3-succinct" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec5f0388aa6d935ca3a17444086120f393f0b2f0816010b5ff95998c1c4095e3" +checksum = "b6c2c2010678b9332b563eaa38364915b585c1a94b5ca61e2c7541c087ddda5c" dependencies = [ "serde", ] -[[package]] -name = "pairing" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135590d8bdba2b31346f9cd1fb2a912329f5135e832a4f422942eb6ead8b6b3b" -dependencies = [ - "group 0.12.1", -] - [[package]] name = "pairing" version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f" dependencies = [ - "group 0.13.0", + "group", ] [[package]] @@ -4135,14 +3944,14 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "parking_lot" -version = "0.12.5" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" +checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" dependencies = [ "lock_api", "parking_lot_core", @@ -4150,45 +3959,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.12" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-link", -] - -[[package]] -name = "pasta_curves" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc65faf8e7313b4b1fbaa9f7ca917a0eed499a9663be71477f87993604341d8" -dependencies = [ - "blake2b_simd", - "ff 0.12.1", - "group 0.12.1", - "lazy_static", - "rand 0.8.5", - "static_assertions", - "subtle", -] - -[[package]] -name = "pasta_curves" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e57598f73cc7e1b2ac63c79c517b31a0877cd7c402cdcaa311b5208de7a095" -dependencies = [ - "blake2b_simd", - "ff 0.13.1", - "group 0.13.0", - "lazy_static", - "rand 0.8.5", - "static_assertions", - "subtle", + "windows-targets 0.52.6", ] [[package]] @@ -4223,14 +4002,14 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "percent-encoding" -version = "2.3.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" @@ -4273,7 +4052,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -4287,29 +4066,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.11" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1749c7ed4bcaf4c3d0a3efc28538844fb29bcdd7d2b67b2be7e20ba861ff517" +checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.11" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b20ed30f105399776b9c883e68e536ef602a16ae6f596d2c473591d6ad64c6" +checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "pin-project-lite" -version = "0.2.17" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -4327,6 +4106,12 @@ dependencies = [ "spki", ] +[[package]] +name = "pkg-config" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + [[package]] name = "plain_hasher" version = "0.2.3" @@ -4372,9 +4157,9 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "potential_utf" -version = "0.1.5" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" dependencies = [ "zerovec", ] @@ -4396,12 +4181,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.37" +version = "0.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +checksum = "6837b9e10d61f45f987d50808f83d1ee3d206c66acf650c3e4ae2e1f6ddedf55" dependencies = [ "proc-macro2", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -4426,11 +4211,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.5.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" +checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" dependencies = [ - "toml_edit 0.25.11+spec-1.1.0", + "toml_edit 0.22.27", ] [[package]] @@ -4452,14 +4237,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "proc-macro2" -version = "1.0.106" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -4472,22 +4257,23 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", "version_check", "yansi", ] [[package]] name = "proptest" -version = "1.11.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744" +checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f" dependencies = [ "bit-set", "bit-vec", "bitflags", + "lazy_static", "num-traits", - "rand 0.9.4", + "rand 0.9.1", "rand_chacha 0.9.0", "rand_xorshift", "regex-syntax", @@ -4498,13 +4284,13 @@ dependencies = [ [[package]] name = "proptest-derive" -version = "0.7.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb6dc647500e84a25a85b100e76c85b8ace114c209432dc174f20aac11d4ed6c" +checksum = "095a99f75c69734802359b682be8daaf8980296731f6470434ea2c652af1dd30" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -4526,8 +4312,8 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2", - "thiserror 2.0.18", + "socket2 0.6.1", + "thiserror 2.0.17", "tokio", "tracing", "web-time", @@ -4535,21 +4321,20 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.14" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" dependencies = [ - "aws-lc-rs", "bytes", - "getrandom 0.3.4", + "getrandom 0.3.3", "lru-slab", - "rand 0.9.4", + "rand 0.9.1", "ring", "rustc-hash", "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.18", + "thiserror 2.0.17", "tinyvec", "tracing", "web-time", @@ -4564,16 +4349,16 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2", + "socket2 0.6.1", "tracing", "windows-sys 0.60.2", ] [[package]] name = "quote" -version = "1.0.45" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] @@ -4584,12 +4369,6 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" -[[package]] -name = "r-efi" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" - [[package]] name = "radium" version = "0.7.0" @@ -4610,12 +4389,12 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" +checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" dependencies = [ "rand_chacha 0.9.0", - "rand_core 0.9.5", + "rand_core 0.9.3", "serde", ] @@ -4636,7 +4415,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.5", + "rand_core 0.9.3", ] [[package]] @@ -4645,16 +4424,16 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.17", + "getrandom 0.2.16", ] [[package]] name = "rand_core" -version = "0.9.5" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom 0.3.4", + "getrandom 0.3.3", "serde", ] @@ -4664,24 +4443,24 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" dependencies = [ - "rand_core 0.9.5", + "rand_core 0.9.3", ] [[package]] name = "rapidhash" -version = "4.4.1" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e48930979c155e2f33aa36ab3119b5ee81332beb6482199a8ecd6029b80b59" +checksum = "d8e65c75143ce5d47c55b510297eeb1182f3c739b6043c537670e9fc18612dae" dependencies = [ - "rand 0.9.4", + "rand 0.9.1", "rustversion", ] [[package]] name = "rayon" -version = "1.12.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -4699,9 +4478,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.18" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" +checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" dependencies = [ "bitflags", ] @@ -4712,29 +4491,29 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ - "getrandom 0.2.17", + "getrandom 0.2.16", "libredox", - "thiserror 2.0.18", + "thiserror 2.0.17", ] [[package]] name = "ref-cast" -version = "1.0.25" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.25" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -4762,9 +4541,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.10" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "relative-path" @@ -4774,13 +4553,14 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" [[package]] name = "reqwest" -version = "0.12.28" +version = "0.12.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" +checksum = "eabf4c97d9130e2bf606614eb937e86edac8292eaa6f422f995d7e8de1eb1813" dependencies = [ "base64", "bytes", "encoding_rs", + "futures-channel", "futures-core", "futures-util", "h2", @@ -4789,11 +4569,13 @@ dependencies = [ "http-body-util", "hyper", "hyper-rustls", + "hyper-tls", "hyper-util", "js-sys", "log", "mime", "mime_guess", + "native-tls", "percent-encoding", "pin-project-lite", "quinn", @@ -4805,6 +4587,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper", "tokio", + "tokio-native-tls", "tokio-rustls", "tokio-util", "tower", @@ -4818,45 +4601,6 @@ dependencies = [ "webpki-roots", ] -[[package]] -name = "reqwest" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" -dependencies = [ - "base64", - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "js-sys", - "log", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls", - "rustls-pki-types", - "rustls-platform-verifier", - "serde", - "serde_json", - "sync_wrapper", - "tokio", - "tokio-rustls", - "tower", - "tower-http", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "revm" version = "29.0.0" @@ -5158,12 +4902,12 @@ dependencies = [ "kzg-rs", "libsecp256k1", "p256", - "rand 0.9.4", + "rand 0.9.1", "revm-primitives 20.2.1", "ripemd", "rstest", "rug", - "secp256k1 0.31.1", + "secp256k1 0.31.0", "sha2 0.10.9", "substrate-bn", ] @@ -5239,7 +4983,7 @@ dependencies = [ "revm 29.0.0", "serde", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.17", ] [[package]] @@ -5263,8 +5007,8 @@ dependencies = [ "revm-primitives 20.2.1", "serde", "serde_json", - "thiserror 2.0.18", - "toml 0.9.12+spec-1.1.0", + "thiserror 2.0.17", + "toml 0.9.11+spec-1.1.0", ] [[package]] @@ -5292,7 +5036,7 @@ dependencies = [ "revm-statetest-types", "serde", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.17", "triehash", "walkdir", ] @@ -5315,7 +5059,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.17", + "getrandom 0.2.16", "libc", "untrusted", "windows-sys 0.52.0", @@ -5366,15 +5110,15 @@ dependencies = [ "regex", "relative-path", "rustc_version 0.4.1", - "syn 2.0.117", + "syn 2.0.103", "unicode-ident", ] [[package]] name = "rug" -version = "1.29.0" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f6c8f906c90b48e0c1745c9f814c3a31c5eba847043b05c3e9a934dec7c4b3" +checksum = "4207e8d668e5b8eb574bda8322088ccd0d7782d3d03c7e8d562e82ed82bdcbc3" dependencies = [ "az", "gmp-mpfr-sys", @@ -5384,15 +5128,14 @@ dependencies = [ [[package]] name = "ruint" -version = "1.17.2" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c141e807189ad38a07276942c6623032d3753c8859c146104ac2e4d68865945a" +checksum = "9ecb38f82477f20c5c3d62ef52d7c4e536e38ea9b73fb570a20c5cae0e14bcf6" dependencies = [ "alloy-rlp", "arbitrary", "ark-ff 0.3.0", "ark-ff 0.4.2", - "ark-ff 0.5.0", "bytes", "fastrlp 0.3.1", "fastrlp 0.4.0", @@ -5403,10 +5146,10 @@ dependencies = [ "primitive-types", "proptest", "rand 0.8.5", - "rand 0.9.4", + "rand 0.9.1", "rlp", "ruint-macro", - "serde_core", + "serde", "valuable", "zeroize", ] @@ -5419,9 +5162,9 @@ checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" [[package]] name = "rustc-hash" -version = "2.1.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" dependencies = [ "rand 0.8.5", ] @@ -5447,29 +5190,28 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.28", + "semver 1.0.26", ] [[package]] name = "rustix" -version = "1.1.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" dependencies = [ "bitflags", "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] name = "rustls" -version = "0.23.38" +version = "0.23.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21" +checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" dependencies = [ - "aws-lc-rs", "once_cell", "ring", "rustls-pki-types", @@ -5484,56 +5226,28 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" dependencies = [ - "openssl-probe", + "openssl-probe 0.2.1", "rustls-pki-types", "schannel", - "security-framework", + "security-framework 3.5.1", ] [[package]] name = "rustls-pki-types" -version = "1.14.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" +checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" dependencies = [ "web-time", "zeroize", ] -[[package]] -name = "rustls-platform-verifier" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784" -dependencies = [ - "core-foundation 0.10.1", - "core-foundation-sys", - "jni", - "log", - "once_cell", - "rustls", - "rustls-native-certs", - "rustls-platform-verifier-android", - "rustls-webpki", - "security-framework", - "security-framework-sys", - "webpki-root-certs", - "windows-sys 0.61.2", -] - -[[package]] -name = "rustls-platform-verifier-android" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" - [[package]] name = "rustls-webpki" -version = "0.103.12" +version = "0.103.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8279bb85272c9f10811ae6a6c547ff594d6a7f3c6c6b02ee9726d1d0dcfcdd06" +checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" dependencies = [ - "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -5541,15 +5255,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.22" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" [[package]] name = "rusty-fork" -version = "0.3.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" dependencies = [ "fnv", "quick-error", @@ -5559,9 +5273,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.23" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "same-file" @@ -5583,11 +5297,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.29" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -5602,18 +5316,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "schemars" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" -dependencies = [ - "dyn-clone", - "ref-cast", - "serde", - "serde_json", -] - [[package]] name = "scoped-tls" version = "1.0.1" @@ -5655,12 +5357,12 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.31.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3c81b43dc2d8877c216a3fccf76677ee1ebccd429566d3e67447290d0c42b2" +checksum = "6a3dff2d01c9aa65c3186a45ff846bfea52cbe6de3b6320ed2a358d90dad0d76" dependencies = [ "bitcoin_hashes", - "rand 0.9.4", + "rand 0.9.1", "secp256k1-sys 0.11.0", ] @@ -5684,9 +5386,22 @@ dependencies = [ [[package]] name = "security-framework" -version = "3.7.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +dependencies = [ + "bitflags", + "core-foundation 0.9.4", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" dependencies = [ "bitflags", "core-foundation 0.10.1", @@ -5697,9 +5412,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.17.0" +version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3" +checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" dependencies = [ "core-foundation-sys", "libc", @@ -5716,12 +5431,11 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.28" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" +checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" dependencies = [ "serde", - "serde_core", ] [[package]] @@ -5769,7 +5483,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -5787,7 +5501,7 @@ version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.12.1", "itoa", "memchr", "serde", @@ -5806,9 +5520,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.1.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26" +checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" dependencies = [ "serde_core", ] @@ -5827,18 +5541,18 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.18.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f" +checksum = "bf65a400f8f66fb7b0552869ad70157166676db75ed8181f8104ea91cf9d0b42" dependencies = [ "base64", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.14.0", - "schemars 0.9.0", - "schemars 1.2.1", - "serde_core", + "indexmap 2.12.1", + "schemars", + "serde", + "serde_derive", "serde_json", "serde_with_macros", "time", @@ -5846,14 +5560,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.18.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65" +checksum = "81679d9ed988d5e9a5e6531dc3f2c28efbd639cbd1dfb628df08edea6004da77" dependencies = [ - "darling", + "darling 0.20.11", "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -5874,7 +5588,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if", - "cpufeatures 0.2.17", + "cpufeatures", "digest 0.9.0", "opaque-debug", ] @@ -5886,7 +5600,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", - "cpufeatures 0.2.17", + "cpufeatures", "digest 0.10.7", "sha2-asm", ] @@ -5912,9 +5626,9 @@ dependencies = [ [[package]] name = "sha3-asm" -version = "0.1.6" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59cbb88c189d6352cc8ae96a39d19c7ecad8f7330b29461187f2587fdc2988d5" +checksum = "c28efc5e327c837aa837c59eae585fc250715ef939ac32881bcc11677cd02d46" dependencies = [ "cc", "cfg-if", @@ -5948,121 +5662,49 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.9" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" [[package]] name = "siphasher" -version = "1.0.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2aa850e253778c88a04c3d7323b043aeda9d3e30d5971937c1855769763678e" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "slab" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" - -[[package]] -name = "slop-algebra" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733912d564a68ff209707e71fdc517d4ff82d4362b6a409f6a8241dfcb7a576a" -dependencies = [ - "itertools 0.14.0", - "p3-field", - "serde", -] - -[[package]] -name = "slop-bn254" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a71b23ede427299e139fb822c5d0ea8fb931dc297eba0c6e2f30f774c04ebc81" -dependencies = [ - "ff 0.13.1", - "p3-bn254-fr", - "serde", - "slop-algebra", - "slop-challenger", - "slop-poseidon2", - "slop-symmetric", - "zkhash", -] - -[[package]] -name = "slop-challenger" -version = "6.1.0" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e4993210936ab317c0d56ee8257e1cdfe6c2fae4df1e158737f034e21d45f9" -dependencies = [ - "futures", - "p3-challenger", - "serde", - "slop-algebra", - "slop-symmetric", -] +checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" [[package]] -name = "slop-koala-bear" -version = "6.1.0" +name = "smallvec" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8986e94b9a43d58fc8ce5bf111b0985479ab888ced923e3052fb19943f7859b4" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" dependencies = [ - "lazy_static", - "p3-koala-bear", "serde", - "slop-algebra", - "slop-challenger", - "slop-poseidon2", - "slop-symmetric", -] - -[[package]] -name = "slop-poseidon2" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b06e4a24cba104a0a39740eedd97e60e8896926cc38e6a58d5866cc9811affa" -dependencies = [ - "p3-poseidon2", -] - -[[package]] -name = "slop-primitives" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0b66701c82f6aab97f4990b5d9ed7463beb5b5042dbe5eda5f6c71a6207b35" -dependencies = [ - "slop-algebra", ] -[[package]] -name = "slop-symmetric" -version = "6.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d159948b924fd00f280064d7a049e43dceb2f26067f32fb99570d3169969ee" -dependencies = [ - "p3-symmetric", -] - -[[package]] -name = "smallvec" -version = "1.15.1" +[[package]] +name = "socket2" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" dependencies = [ - "serde", + "libc", + "windows-sys 0.52.0", ] [[package]] name = "socket2" -version = "0.6.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -6075,7 +5717,7 @@ dependencies = [ "bumpalo", "either", "num-rational", - "semver 1.0.28", + "semver 1.0.26", "solar-data-structures", "solar-interface", "solar-macros", @@ -6116,7 +5758,7 @@ checksum = "2dea34e58332c7d6a8cde1f1740186d31682b7be46e098b8cc16fcb7ffd98bf5" dependencies = [ "bumpalo", "index_vec", - "indexmap 2.14.0", + "indexmap 2.12.1", "parking_lot", "rayon", "rustc-hash", @@ -6130,7 +5772,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d6163af2e773f4d455212fa9ba2c0664506029dd26232eb406f5046092ac311" dependencies = [ "annotate-snippets", - "anstream 0.6.21", + "anstream", "anstyle", "derive_more", "dunce", @@ -6146,7 +5788,7 @@ dependencies = [ "solar-config", "solar-data-structures", "solar-macros", - "thiserror 2.0.18", + "thiserror 2.0.17", "tracing", "unicode-width", ] @@ -6159,7 +5801,7 @@ checksum = "44a98045888d75d17f52e7b76f6098844b76078b5742a450c3ebcdbdb02da124" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -6228,13 +5870,13 @@ dependencies = [ "path-slash", "rayon", "regex", - "reqwest 0.12.28", + "reqwest", "sanitize-filename", - "semver 1.0.28", + "semver 1.0.26", "serde", "serde_json", "sha2 0.10.9", - "thiserror 2.0.18", + "thiserror 2.0.17", "tokio", "toml_edit 0.23.10+spec-1.0.0", "uuid", @@ -6244,9 +5886,9 @@ dependencies = [ [[package]] name = "sp1-lib" -version = "6.1.0" +version = "5.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b96392c1b1c197beaa6b0806099a8d73643a09d5ac0874e26c9c5153a7fcb4c" +checksum = "d0fd8bc101e5603ccf2dc1836ea06410f25ce2298755b2dac626add9be2424b4" dependencies = [ "bincode 1.3.3", "serde", @@ -6255,38 +5897,34 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "6.1.0" +version = "5.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b77098dae9d62e080be3af253188c08e7e96e666423306654eede0110bf363" +checksum = "699935774a5131c1a8b371108d0666c0c80c43611045fb77fae43f2f242676d5" dependencies = [ "bincode 1.3.3", "blake3", - "elf", + "cfg-if", "hex", - "itertools 0.14.0", "lazy_static", "num-bigint 0.4.6", + "p3-baby-bear", + "p3-field", + "p3-poseidon2", + "p3-symmetric", "serde", "sha2 0.10.9", - "slop-algebra", - "slop-bn254", - "slop-challenger", - "slop-koala-bear", - "slop-poseidon2", - "slop-primitives", - "slop-symmetric", ] [[package]] name = "sp1_bls12_381" -version = "0.8.0-sp1-6.0.0" +version = "0.8.0-sp1-5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23e41cd36168cc2e51e5d3e35ff0c34b204d945769a65591a76286d04b51e43" +checksum = "ac255e1704ebcdeec5e02f6a0ebc4d2e9e6b802161938330b6810c13a610c583" dependencies = [ "cfg-if", - "ff 0.13.1", - "group 0.13.0", - "pairing 0.23.0", + "ff", + "group", + "pairing", "rand_core 0.6.4", "sp1-lib", "subtle", @@ -6310,9 +5948,9 @@ dependencies = [ [[package]] name = "stable_deref_trait" -version = "1.2.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "static_assertions" @@ -6328,23 +5966,24 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.27.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" +checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.27.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" +checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.117", + "rustversion", + "syn 2.0.103", ] [[package]] @@ -6446,31 +6085,31 @@ dependencies = [ [[package]] name = "svm-rs" -version = "0.5.24" +version = "0.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "230df06b463c7251e4d1b39b1b3e6f25a9b3a42630179053a1e5f919e6e15534" +checksum = "415b159b54c22d9810087f0991371fd6242a912673e982a7c4ca8ea122f7e00a" dependencies = [ "const-hex", "dirs", - "reqwest 0.13.2", - "semver 1.0.28", + "reqwest", + "semver 1.0.26", "serde", "serde_json", "sha2 0.10.9", "tempfile", - "thiserror 2.0.18", + "thiserror 2.0.17", "url", "zip", ] [[package]] name = "svm-rs-builds" -version = "0.5.24" +version = "0.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b271921143e5b12947a526de464db02b00363919d582a7ea712374840f928328" +checksum = "ab96ac3275ad299c6e5455b69a2f72443c4d3afb4933d92a0f859d48432dea49" dependencies = [ "const-hex", - "semver 1.0.28", + "semver 1.0.26", "serde_json", "svm-rs", ] @@ -6488,9 +6127,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.117" +version = "2.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" +checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8" dependencies = [ "proc-macro2", "quote", @@ -6499,14 +6138,14 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "1.5.7" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53f425ae0b12e2f5ae65542e00898d500d4d318b4baf09f40fd0d410454e9947" +checksum = "f6b1d2e2059056b66fec4a6bb2b79511d5e8d76196ef49c38996f4b48db7662f" dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -6526,14 +6165,14 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "system-configuration" -version = "0.7.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ "bitflags", "core-foundation 0.9.4", @@ -6558,15 +6197,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.27.0" +version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" +checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" dependencies = [ "fastrand", - "getrandom 0.4.2", + "getrandom 0.3.3", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -6580,11 +6219,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.18" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl 2.0.18", + "thiserror-impl 2.0.17", ] [[package]] @@ -6595,18 +6234,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "thiserror-impl" -version = "2.0.18" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -6658,11 +6297,20 @@ dependencies = [ "time-core", ] +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + [[package]] name = "tinystr" -version = "0.8.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" dependencies = [ "displaydoc", "zerovec", @@ -6680,9 +6328,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.11.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" dependencies = [ "tinyvec_macros", ] @@ -6695,29 +6343,39 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.51.1" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f66bf9585cda4b724d3e78ab34b73fb2bbaba9011b9bfdf69dc836382ea13b8c" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ "bytes", "libc", "mio", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.6.1", "tokio-macros", "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.7.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", ] [[package]] @@ -6732,9 +6390,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.18" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -6744,9 +6402,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.18" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" +checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" dependencies = [ "bytes", "futures-core", @@ -6769,17 +6427,17 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.12+spec-1.1.0" +version = "0.9.11+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863" +checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.12.1", "serde_core", - "serde_spanned 1.1.1", + "serde_spanned 1.0.4", "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "toml_writer", - "winnow 0.7.15", + "winnow", ] [[package]] @@ -6800,27 +6458,18 @@ dependencies = [ "serde_core", ] -[[package]] -name = "toml_datetime" -version = "1.1.1+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" -dependencies = [ - "serde_core", -] - [[package]] name = "toml_edit" version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.12.1", "serde", "serde_spanned 0.6.9", "toml_datetime 0.6.11", "toml_write", - "winnow 0.7.15", + "winnow", ] [[package]] @@ -6829,34 +6478,22 @@ version = "0.23.10+spec-1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.12.1", "serde_core", - "serde_spanned 1.1.1", + "serde_spanned 1.0.4", "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "toml_writer", - "winnow 0.7.15", -] - -[[package]] -name = "toml_edit" -version = "0.25.11+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b" -dependencies = [ - "indexmap 2.14.0", - "toml_datetime 1.1.1+spec-1.1.0", - "toml_parser", - "winnow 1.0.1", + "winnow", ] [[package]] name = "toml_parser" -version = "1.1.2+spec-1.1.0" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" +checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" dependencies = [ - "winnow 1.0.1", + "winnow", ] [[package]] @@ -6867,15 +6504,15 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] name = "toml_writer" -version = "1.1.1+spec-1.1.0" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db" +checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" [[package]] name = "tower" -version = "0.5.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", @@ -6888,9 +6525,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.8" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" +checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" dependencies = [ "bitflags", "bytes", @@ -6918,9 +6555,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.44" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -6929,20 +6566,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.31" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" +checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "tracing-core" -version = "0.1.36" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" dependencies = [ "once_cell", "valuable", @@ -6981,9 +6618,9 @@ checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" [[package]] name = "typenum" -version = "1.19.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "ucd-trie" @@ -7026,21 +6663,21 @@ checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" [[package]] name = "unicode-ident" -version = "1.0.24" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "unicode-segmentation" -version = "1.13.2" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.2.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" [[package]] name = "unicode-xid" @@ -7062,15 +6699,13 @@ checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae" [[package]] name = "url" -version = "2.5.8" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde", - "serde_derive", ] [[package]] @@ -7087,11 +6722,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.23.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9" +checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" dependencies = [ - "getrandom 0.4.2", + "getrandom 0.3.3", "js-sys", "serde_core", "wasm-bindgen", @@ -7139,6 +6774,12 @@ dependencies = [ "sval_serde", ] +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "version_check" version = "0.9.5" @@ -7186,21 +6827,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasip2" -version = "1.0.2+wasi-0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" -dependencies = [ - "wit-bindgen", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" +name = "wasi" +version = "0.14.2+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" dependencies = [ - "wit-bindgen", + "wit-bindgen-rt", ] [[package]] @@ -7245,7 +6877,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", "wasm-bindgen-shared", ] @@ -7258,28 +6890,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap 2.14.0", - "wasm-encoder", - "wasmparser", -] - [[package]] name = "wasm-streams" version = "0.4.2" @@ -7293,23 +6903,11 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasmparser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags", - "hashbrown 0.15.5", - "indexmap 2.14.0", - "semver 1.0.28", -] - [[package]] name = "wasmtimer" -version = "0.4.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c598d6b99ea013e35844697fc4670d08339d5cda15588f193c6beedd12f644b" +checksum = "d8d49b5d6c64e8558d9b1b065014426f35c18de636895d24893dbbd329743446" dependencies = [ "futures", "js-sys", @@ -7339,42 +6937,33 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-root-certs" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804f18a4ac2676ffb4e8b5b5fa9ae38af06df08162314f96a68d2a363e21a8ca" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "webpki-roots" -version = "1.0.6" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed" +checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" dependencies = [ "rustls-pki-types", ] [[package]] name = "winapi-util" -version = "0.1.11" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] name = "windows-core" -version = "0.62.2" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ "windows-implement", "windows-interface", - "windows-link", + "windows-link 0.1.3", "windows-result", "windows-strings", ] @@ -7387,7 +6976,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -7398,9 +6987,15 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] +[[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" @@ -7409,40 +7004,31 @@ checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-registry" -version = "0.6.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" +checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" dependencies = [ - "windows-link", + "windows-link 0.1.3", "windows-result", "windows-strings", ] [[package]] name = "windows-result" -version = "0.4.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" dependencies = [ - "windows-link", + "windows-link 0.1.3", ] [[package]] name = "windows-strings" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" -dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" dependencies = [ - "windows-targets 0.42.2", + "windows-link 0.1.3", ] [[package]] @@ -7478,22 +7064,7 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-link 0.2.1", ] [[package]] @@ -7518,7 +7089,7 @@ version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows-link", + "windows-link 0.2.1", "windows_aarch64_gnullvm 0.53.1", "windows_aarch64_msvc 0.53.1", "windows_i686_gnu 0.53.1", @@ -7529,12 +7100,6 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -7547,12 +7112,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" @@ -7565,12 +7124,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -7595,12 +7148,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - [[package]] name = "windows_i686_msvc" version = "0.52.6" @@ -7613,12 +7160,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -7631,12 +7172,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" @@ -7649,12 +7184,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -7669,115 +7198,27 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "0.7.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "1.0.1" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09dac053f1cd375980747450bfc7250c264eaae0583872e845c0c7cd578872b5" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" dependencies = [ "memchr", ] [[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck", - "indexmap 2.14.0", - "prettyplease", - "syn 2.0.117", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn 2.0.117", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" +name = "wit-bindgen-rt" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" dependencies = [ - "anyhow", "bitflags", - "indexmap 2.14.0", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap 2.14.0", - "log", - "semver 1.0.28", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", ] [[package]] name = "writeable" -version = "0.6.3" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" [[package]] name = "wyz" @@ -7805,10 +7246,11 @@ dependencies = [ [[package]] name = "yoke" -version = "0.8.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" dependencies = [ + "serde", "stable_deref_trait", "yoke-derive", "zerofrom", @@ -7816,82 +7258,82 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", "synstructure", ] [[package]] name = "zerocopy" -version = "0.8.48" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.48" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "zerofrom" -version = "0.1.7" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.7" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", "synstructure", ] [[package]] name = "zeroize" -version = "1.8.2" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.4.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] name = "zerotrie" -version = "0.2.4" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" dependencies = [ "displaydoc", "yoke", @@ -7900,9 +7342,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.6" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" dependencies = [ "yoke", "zerofrom", @@ -7911,13 +7353,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 2.0.103", ] [[package]] @@ -7929,7 +7371,7 @@ dependencies = [ "arbitrary", "crc32fast", "flate2", - "indexmap 2.14.0", + "indexmap 2.12.1", "memchr", "zopfli", ] @@ -7941,62 +7383,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fa5b9958fd0b5b685af54f2c3fa21fca05fe295ebaf3e77b6d24d96c4174037" dependencies = [ "log", - "thiserror 2.0.18", + "thiserror 2.0.17", "zip", ] -[[package]] -name = "zkhash" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4352d1081da6922701401cdd4cbf29a2723feb4cfabb5771f6fee8e9276da1c7" -dependencies = [ - "ark-ff 0.4.2", - "ark-std 0.4.0", - "bitvec", - "blake2", - "bls12_381", - "byteorder", - "cfg-if", - "group 0.12.1", - "group 0.13.0", - "halo2", - "hex", - "jubjub", - "lazy_static", - "pasta_curves 0.5.1", - "rand 0.8.5", - "serde", - "sha2 0.10.9", - "sha3", - "subtle", -] - [[package]] name = "zlib-rs" -version = "0.6.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513" +checksum = "40990edd51aae2c2b6907af74ffb635029d5788228222c4bb811e9351c0caad3" [[package]] name = "zmij" -version = "1.0.21" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" +checksum = "02aae0f83f69aafc94776e879363e9771d7ecbffe2c7fbb6c14c5e00dfe88439" [[package]] name = "zopfli" -version = "0.8.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249" +checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7" dependencies = [ "bumpalo", "crc32fast", "log", "simd-adler32", ] - -[[patch.unused]] -name = "gmp-mpfr-sys" -version = "1.6.8" -source = "git+ssh://git@github.com/Entropy-Foundation/gmp-mpfr-sys?branch=master#6d5c91968d809b692df0abdcc3d93ce3588ff7ad" diff --git a/crates/supra-extension/src/contracts/generator.rs b/crates/supra-extension/src/contracts/generator.rs index d927a06f8e..bfe043c250 100644 --- a/crates/supra-extension/src/contracts/generator.rs +++ b/crates/supra-extension/src/contracts/generator.rs @@ -94,18 +94,9 @@ const CORE_FACET: &str = "CoreFacet"; const DIAMOND_INIT: &str = "DiamondInit"; sol! { - /// Facet cut actions - enum FacetCutAction {Add, Replace, Remove} - // Add=0, Replace=1, Remove=2 - - struct FacetCut { - address facetAddress; - FacetCutAction action; - bytes4[] functionSelectors; - } - /// Initialization parameters for AutomationCore contract. - struct InitializeParams { + /// Initialization parameters for Automation Registry State. + struct InitParams { uint64 taskDurationCapSecs; uint128 registryMaxGasCap; uint128 automationBaseFeeWeiPerSec; @@ -118,23 +109,31 @@ sol! { uint64 sysTaskDurationCapSecs; uint128 sysRegistryMaxGasCap; uint16 sysTaskCapacity; - address vmSigner; - address erc20Supra; bool registrationEnabled; bool automationEnabled; } - contract Diamond { - constructor(address _owner, address _diamond_cut); + /// Addresses of the facets for diamond cut and diamond initializer contract + struct FacetsDeployment { + address diamondCutFacet; + address loupeFacet; + address ownershipFacet; + address configFacet; + address registryFacet; + address coreFacet; + address diamondInit; } - contract DiamondInit { - function initialize(InitializeParams calldata params); + contract Diamond { + constructor( + address _contractOwner, + FacetsDeployment memory _facets, + address _vmSigner, + address _erc20Supra, + InitParams memory _params + ); } - contract DiamondCutFacet { - function diamondCut(FacetCut[] calldata _diamondCut, address _diamond_init, bytes calldata _diamond_init_calldata); - } } /// Genesis Transaction generator using configured address as transaction owner. @@ -186,11 +185,13 @@ impl GenesisTransactionGenerator { initial_native_token, supra_nova_config, } = config; - // First foundation multisig account setup should be done + // First Create2 Factory contract deployment, which will allow later to utilize create2 API + // if required during genesis let mut genesis_transactions = BTreeMap::from([( GenesisTransactionTags::Create2Factory, Self::generate_create2_factory_transaction(), )]); + // Second multisig contract and foundation multisig account setup should be done genesis_transactions .extend(self.setup_multisig_wallet(foundation_owners, foundation_threshold)?); if full_set { @@ -202,9 +203,10 @@ impl GenesisTransactionGenerator { // Erc20 Supra contracts let erc20_contracts = self.setup_erc20_contracts(multisig_address, initial_native_token)?; - let erc20supra_address = self - .address - .create(GenesisTransactionTags::Erc20Supra as u64); + let erc20supra_address = *erc20_contracts + .get(&GenesisTransactionTags::Erc20Supra) + .expect("Erc20Supra deployment transaction exists") + .deploy_address(); genesis_transactions.extend(erc20_contracts); // BlockMetadata contract @@ -572,41 +574,41 @@ impl GenesisTransactionGenerator { /// Deployment order follows GenesisTransactionTags: /// /// 1. DiamondCutFacet, // Facet contract enabling APIs to extend facets and executed registered facet - /// 2. Diamond, // The wrapper contract of all the facets, main entry point of automation registry API - /// 3. DiamondLoupeFacet, // Facet providing API to query registered facets - /// 4. OwnershipFacet, // Facet to manage ownership credential updates and checks - /// 5. ConfigFacet, // Facet to manage automation registry configuration - /// 6. RegistryFacet, // Facet providing API for task registration, cancellation and registry state query - /// 7. CoreFacet, // Facet providing API to monitor cycle and initiate bookkeeping on cycle transition - /// 8. DiamondInit, - /// All proxy addresses are pre-computed before deployment to handle circular dependencies. + /// 2. DiamondLoupeFacet, // Facet providing API to query registered facets + /// 3. OwnershipFacet, // Facet to manage ownership credential updates and checks + /// 4. ConfigFacet, // Facet to manage automation registry configuration + /// 5. RegistryFacet, // Facet providing API for task registration, cancellation and registry state query + /// 6. CoreFacet, // Facet providing API to monitor cycle and initiate bookkeeping on cycle transition + /// 7. DiamondInit, + /// 8. Diamond, // The wrapper contract of all the facets, main entry point of automation registry API + /// All contracts addresses are pre-computed before deployment to handle circular dependencies if any. fn setup_automation_registry( &mut self, owner: Address, - _erc20_supra_address: Address, + erc20_supra_address: Address, registry_config: AutomationRegistryConfig, ) -> Result> { - let _config = registry_config + let config = registry_config .v1() .ok_or_else(|| anyhow!("Unhandled configuration version"))?; // Pre-compute all deployment addresses // nonce+0: DiamondCutFacet (implementation for Diamond proxy) - // nonce+1: Diamond (proxy) - // nonce+2: DiamondLoupeFacet - // nonce+3: OwnershipFacet - // nonce+4: ConfigFacet - // nonce+5: RegistryFacet - // nonce+6: CoreFacet - // nonce+7: DiamondInit + // nonce+1: DiamondLoupeFacet + // nonce+2: OwnershipFacet + // nonce+3: ConfigFacet + // nonce+4: RegistryFacet + // nonce+5: CoreFacet + // nonce+6: DiamondInit + // nonce+7: Diamond (proxy to all facets APIs) let diamond_cut_facet_addr = self.address.create(self.nonce); - let diamond_addr = self.address.create(self.nonce + 1); - let diamond_loupe_facet_addr = self.address.create(self.nonce + 2); - let ownership_facet_addr = self.address.create(self.nonce + 3); - let config_facet_addr = self.address.create(self.nonce + 4); - let registry_facet_addr = self.address.create(self.nonce + 5); - let core_facet_addr = self.address.create(self.nonce + 6); - let diamond_init_addr = self.address.create(self.nonce + 7); + let diamond_loupe_facet_addr = self.address.create(self.nonce + 1); + let ownership_facet_addr = self.address.create(self.nonce + 2); + let config_facet_addr = self.address.create(self.nonce + 3); + let registry_facet_addr = self.address.create(self.nonce + 4); + let core_facet_addr = self.address.create(self.nonce + 5); + let diamond_init_addr = self.address.create(self.nonce + 6); + let diamond_addr = self.address.create(self.nonce + 7); // ------------------------------------------------------------------------- // 1. Deploy DiamondCutFacet (no constructor args) @@ -621,21 +623,7 @@ impl GenesisTransactionGenerator { self.nonce += 1; // ------------------------------------------------------------------------- - // 2. Deploy Diamond - // ------------------------------------------------------------------------- - let diamond_init_data = Self::load_contract_bytecode(DIAMOND)?; - let diamond_constructor_data = Diamond::constructorCall { - _owner: owner, - _diamond_cut: diamond_cut_facet_addr, - } - .abi_encode(); - let diamond_data = [diamond_init_data, diamond_constructor_data].concat(); - let diamond_txn = - GenesisTransaction::create(self.address, diamond_data, self.nonce, diamond_addr); - self.nonce += 1; - - // ------------------------------------------------------------------------- - // 3. Deploy DiamondLoupeFacet + // 2. Deploy DiamondLoupeFacet // ------------------------------------------------------------------------- let diamond_loupe_data = Self::load_contract_bytecode(DIAMOND_LOUPE_FACET)?; let diamond_loupe_txn = GenesisTransaction::create( @@ -647,7 +635,7 @@ impl GenesisTransactionGenerator { self.nonce += 1; // ------------------------------------------------------------------------- - // 4. Deploy Ownership facet + // 3. Deploy Ownership facet // ------------------------------------------------------------------------- let ownership_data = Self::load_contract_bytecode(OWNERSHIP_FACET)?; let ownership_txn = GenesisTransaction::create( @@ -659,7 +647,7 @@ impl GenesisTransactionGenerator { self.nonce += 1; // ------------------------------------------------------------------------- - // 5. Deploy Config Facet + // 4. Deploy Config Facet // ------------------------------------------------------------------------- let config_data = Self::load_contract_bytecode(CONFIG_FACET)?; let config_txn = @@ -667,7 +655,7 @@ impl GenesisTransactionGenerator { self.nonce += 1; // ------------------------------------------------------------------------- - // 6. Deploy Register facet + // 5. Deploy Register facet // ------------------------------------------------------------------------- let register_data = Self::load_contract_bytecode(REGISTRY_FACET)?; let register_txn = GenesisTransaction::create( @@ -687,7 +675,7 @@ impl GenesisTransactionGenerator { self.nonce += 1; // ------------------------------------------------------------------------- - // 6. Deploy Core facet + // 7. Deploy Core facet // ------------------------------------------------------------------------- let diamond_init_data = Self::load_contract_bytecode(DIAMOND_INIT)?; let diamond_init_txn = GenesisTransaction::create( @@ -698,6 +686,50 @@ impl GenesisTransactionGenerator { ); self.nonce += 1; + // ------------------------------------------------------------------------- + // 7. Deploy Diamond + // ------------------------------------------------------------------------- + let diamond_init_data = Self::load_contract_bytecode(DIAMOND)?; + let facets = FacetsDeployment { + diamondCutFacet: diamond_cut_facet_addr, + loupeFacet: diamond_loupe_facet_addr, + ownershipFacet: ownership_facet_addr, + configFacet: config_facet_addr, + registryFacet: registry_facet_addr, + coreFacet: core_facet_addr, + diamondInit: diamond_init_addr, + }; + + let init_params = InitParams { + taskDurationCapSecs: config.task_duration_cap_secs, + registryMaxGasCap: config.registry_max_gas_cap, + automationBaseFeeWeiPerSec: config.automation_base_fee_wei_per_sec, + flatRegistrationFeeWei: config.flat_registration_fee_wei, + congestionThresholdPercentage: config.congestion_threshold_percentage, + congestionBaseFeeWeiPerSec: config.congestion_base_fee_wei_per_sec, + congestionExponent: config.congestion_exponent, + taskCapacity: config.task_capacity, + cycleDurationSecs: config.cycle_duration_secs, + sysTaskDurationCapSecs: config.sys_task_duration_cap_secs, + sysRegistryMaxGasCap: config.sys_registry_max_gas_cap, + sysTaskCapacity: config.sys_task_capacity, + registrationEnabled: true, + automationEnabled: true, + }; + + let diamond_constructor_data = Diamond::constructorCall { + _contractOwner: owner, + _facets: facets, + _vmSigner: VM_SIGNER, + _erc20Supra: erc20_supra_address, + _params: init_params, + } + .abi_encode(); + let diamond_data = [diamond_init_data, diamond_constructor_data].concat(); + let diamond_txn = + GenesisTransaction::create(self.address, diamond_data, self.nonce, diamond_addr); + self.nonce += 1; + Ok(BTreeMap::from([ (GenesisTransactionTags::DiamondCutFacet, diamond_cut_txn), (GenesisTransactionTags::Diamond, diamond_txn), @@ -715,29 +747,39 @@ impl GenesisTransactionGenerator { config: SupraNovaConfig, owner: Address, ) -> Result> { + // First setup all independent contracts + // 1. Wrapped token contracts + // 2. Hypernova contracts + // 3. Token Vault contracts let wrapped_token_contracts = self.setup_wrapped_token_contracts(owner)?; let hyper_nova_contracts = self.setup_hyper_nova_contracts(owner, &config)?; let token_vault_contracts = self.setup_token_vault_contracts(owner, &config)?; + // 4. Setup FeeOperator contracts which depends on hypernova deployment let hyper_nova = *hyper_nova_contracts .get(&GenesisTransactionTags::HypernovaProxy) .expect("Hypernova contract should be deployed") .deploy_address(); + let fee_operator_contracts = self.setup_fee_operator_contracts(owner, hyper_nova, &config)?; + // 5. Setup Token Bridge contracts which depends on all above let token_vault = *token_vault_contracts .get(&GenesisTransactionTags::TokenVaultProxy) .expect("TokenVault contract should be deployed") .deploy_address(); + let fee_operator = *fee_operator_contracts .get(&GenesisTransactionTags::FeeOperatorProxy) .expect("FeeOperator contract should be deployed") .deploy_address(); + let wrapped_token = *wrapped_token_contracts .get(&GenesisTransactionTags::WrappedTokenFactoryProxy) .expect("WrappedToken contract should be deployed") .deploy_address(); + let token_bridge_contracts = self.setup_token_bridge_contracts( owner, hyper_nova, @@ -746,13 +788,13 @@ impl GenesisTransactionGenerator { wrapped_token, &config, )?; + let mut contract_txns = wrapped_token_contracts; contract_txns.extend(hyper_nova_contracts); contract_txns.extend(token_vault_contracts); contract_txns.extend(fee_operator_contracts); contract_txns.extend(token_bridge_contracts); - // For future implementation of Supra Nova and Bridge contracts deployment Ok(contract_txns) } diff --git a/crates/supra-extension/src/contracts/transaction.rs b/crates/supra-extension/src/contracts/transaction.rs index 197b79d3d3..e0995332ae 100644 --- a/crates/supra-extension/src/contracts/transaction.rs +++ b/crates/supra-extension/src/contracts/transaction.rs @@ -10,11 +10,12 @@ use std::fmt::{Debug, Display}; pub const CREATE2_FACTORY_OWNER: Address = address!("0x3fAB184622Dc19b6109349B94811493BF2a45362"); -/// The default CREATE2 FACTORY contract address. +/// The default CREATE2 FACTORY contract address. Assumed deployed by [CREATE2_FACTORY_OWNER] with nonce 0 pub const CREATE2_FACTORY_ADDRESS: Address = address!("0x4e59b44847b379578588920ca78fbf26c0b4956c"); -/// The initcode of the default CREATE2 FACTORY. +/// The init-code of the default CREATE2 FACTORY widely used in community +/// Retrieved from https://github.com/Arachnid/deterministic-deployment-proxy pub const CREATE2_FACTORY_CODE: &[u8] = &hex!( "604580600e600039806000f350fe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3" ); @@ -22,16 +23,22 @@ pub const CREATE2_FACTORY_CODE: &[u8] = &hex!( /// Represents data required to construct genesis contracts deployment transaction #[derive(Clone, Getters, Dissolve, Constructor)] pub struct GenesisTransaction { + /// Sender of the transaction sender: Address, + /// Kind of the transaction. kind: TxKind, + /// Input data of the transaction. data: Vec, + /// Expected nonce of the sender account. nonce: u64, + /// Pre-computed deploy address of the contract if the transaction deploys a contract. deploy_address: Address, + /// Amount to mint to the contract address if the transaction deploys a contract. value: u128, } impl GenesisTransaction { - /// Creates a new genesis transaction with the given parameters to deploy a contract. + /// Creates a new genesis transaction with the given parameters to deploy a contract via standard create API. pub fn create( sender: Address, data: Vec, @@ -48,7 +55,7 @@ impl GenesisTransaction { ) } - /// Creates a new genesis transaction with the given parameters to deploy a contract. + /// Creates a new genesis transaction with the given parameters to deploy a contract via create2 API. pub fn create2( sender: Address, salt: &str, @@ -102,13 +109,13 @@ pub enum GenesisTransactionTags { // Automation registry contracts DiamondCutFacet = 10, - Diamond = 11, - DiamondLoupeFacet = 12, - OwnershipFacet = 13, - ConfigFacet = 14, - RegistryFacet = 15, - CoreFacet = 16, - DiamondInit = 17, + DiamondLoupeFacet = 11, + OwnershipFacet = 12, + ConfigFacet = 13, + RegistryFacet = 14, + CoreFacet = 15, + DiamondInit = 16, + Diamond = 17, // Supra Nova contracts WrappedToken = 18, // Impl diff --git a/crates/supra-extension/src/supra_contract_bindings/mod.rs b/crates/supra-extension/src/supra_contract_bindings/mod.rs index 9b6d7d06b0..f23401cf42 100644 --- a/crates/supra-extension/src/supra_contract_bindings/mod.rs +++ b/crates/supra-extension/src/supra_contract_bindings/mod.rs @@ -3,4 +3,4 @@ //! This is autogenerated code. //! Do not manually edit these files. //! These files may be overwritten by the codegen system at any time. -pub(crate) mod r#supra_contracts_bindings; +pub mod r#supra_contracts_bindings; diff --git a/crates/supra-extension/src/supra_contract_bindings/supra_contracts_bindings.rs b/crates/supra-extension/src/supra_contract_bindings/supra_contracts_bindings.rs index bba574c3a1..3a8a254237 100644 --- a/crates/supra-extension/src/supra_contract_bindings/supra_contracts_bindings.rs +++ b/crates/supra-extension/src/supra_contract_bindings/supra_contracts_bindings.rs @@ -926,7 +926,7 @@ interface SupraContractsBindings { function getTaskIdList() external view returns (uint256[] memory); function ifTaskExists(uint64 _taskIndex) external view returns (bool); function isAutomationEnabled() external view returns (bool); - function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external; + function processTasks(uint64 _cycleIndex, uint256[] memory _taskIndexes) external; } ``` @@ -1246,8 +1246,8 @@ interface SupraContractsBindings { }, { "name": "_taskIndexes", - "type": "uint64[]", - "internalType": "uint64[]" + "type": "uint256[]", + "internalType": "uint256[]" } ], "outputs": [], @@ -3223,9 +3223,9 @@ function isAutomationEnabled() external view returns (bool); }; #[derive(serde::Serialize, serde::Deserialize)] #[derive(Default, Debug, PartialEq, Eq, Hash)] - /**Function with signature `processTasks(uint64,uint64[])` and selector `0x7f69c35c`. + /**Function with signature `processTasks(uint64,uint256[])` and selector `0x40b7cbc6`. ```solidity -function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external; +function processTasks(uint64 _cycleIndex, uint256[] memory _taskIndexes) external; ```*/ #[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)] #[derive(Clone)] @@ -3233,9 +3233,11 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external #[allow(missing_docs)] pub _cycleIndex: u64, #[allow(missing_docs)] - pub _taskIndexes: alloy::sol_types::private::Vec, + pub _taskIndexes: alloy::sol_types::private::Vec< + alloy::sol_types::private::primitives::aliases::U256, + >, } - ///Container type for the return parameters of the [`processTasks(uint64,uint64[])`](processTasksCall) function. + ///Container type for the return parameters of the [`processTasks(uint64,uint256[])`](processTasksCall) function. #[allow(non_camel_case_types, non_snake_case, clippy::pub_underscore_fields)] #[derive(Clone)] pub struct processTasksReturn {} @@ -3252,10 +3254,15 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external #[allow(dead_code)] type UnderlyingSolTuple<'a> = ( alloy::sol_types::sol_data::Uint<64>, - alloy::sol_types::sol_data::Array>, + alloy::sol_types::sol_data::Array>, ); #[doc(hidden)] - type UnderlyingRustTuple<'a> = (u64, alloy::sol_types::private::Vec); + type UnderlyingRustTuple<'a> = ( + u64, + alloy::sol_types::private::Vec< + alloy::sol_types::private::primitives::aliases::U256, + >, + ); #[cfg(test)] #[allow(dead_code, unreachable_patterns)] fn _type_assertion( @@ -3328,7 +3335,7 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external impl alloy_sol_types::SolCall for processTasksCall { type Parameters<'a> = ( alloy::sol_types::sol_data::Uint<64>, - alloy::sol_types::sol_data::Array>, + alloy::sol_types::sol_data::Array>, ); type Token<'a> = = as alloy_sol_types::SolType>::Token<'a>; - const SIGNATURE: &'static str = "processTasks(uint64,uint64[])"; - const SELECTOR: [u8; 4] = [127u8, 105u8, 195u8, 92u8]; + const SIGNATURE: &'static str = "processTasks(uint64,uint256[])"; + const SELECTOR: [u8; 4] = [64u8, 183u8, 203u8, 198u8]; #[inline] fn new<'a>( tuple: as alloy_sol_types::SolType>::RustType, @@ -3353,7 +3360,7 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external 64, > as alloy_sol_types::SolType>::tokenize(&self._cycleIndex), , + alloy::sol_types::sol_data::Uint<256>, > as alloy_sol_types::SolType>::tokenize(&self._taskIndexes), ) } @@ -3413,9 +3420,9 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external pub const SELECTORS: &'static [[u8; 4usize]] = &[ [18u8, 247u8, 44u8, 244u8], [35u8, 33u8, 204u8, 163u8], + [64u8, 183u8, 203u8, 198u8], [107u8, 93u8, 140u8, 86u8], [125u8, 237u8, 9u8, 27u8], - [127u8, 105u8, 195u8, 92u8], [138u8, 170u8, 64u8, 78u8], [178u8, 239u8, 104u8, 150u8], [228u8, 142u8, 14u8, 152u8], @@ -3425,9 +3432,9 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external pub const VARIANT_NAMES: &'static [&'static str] = &[ ::core::stringify!(getTaskDetailsBulk), ::core::stringify!(getActiveTaskIds), + ::core::stringify!(processTasks), ::core::stringify!(getCycleStateDetails), ::core::stringify!(blockPrologue), - ::core::stringify!(processTasks), ::core::stringify!(ifTaskExists), ::core::stringify!(getTaskDetails), ::core::stringify!(isAutomationEnabled), @@ -3437,9 +3444,9 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external pub const SIGNATURES: &'static [&'static str] = &[ ::SIGNATURE, ::SIGNATURE, + ::SIGNATURE, ::SIGNATURE, ::SIGNATURE, - ::SIGNATURE, ::SIGNATURE, ::SIGNATURE, ::SIGNATURE, @@ -3542,6 +3549,17 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external } getActiveTaskIds }, + { + fn processTasks( + data: &[u8], + ) -> alloy_sol_types::Result { + ::abi_decode_raw( + data, + ) + .map(SupraContractsBindingsCalls::processTasks) + } + processTasks + }, { fn getCycleStateDetails( data: &[u8], @@ -3564,17 +3582,6 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external } blockPrologue }, - { - fn processTasks( - data: &[u8], - ) -> alloy_sol_types::Result { - ::abi_decode_raw( - data, - ) - .map(SupraContractsBindingsCalls::processTasks) - } - processTasks - }, { fn ifTaskExists( data: &[u8], @@ -3661,6 +3668,17 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external } getActiveTaskIds }, + { + fn processTasks( + data: &[u8], + ) -> alloy_sol_types::Result { + ::abi_decode_raw_validate( + data, + ) + .map(SupraContractsBindingsCalls::processTasks) + } + processTasks + }, { fn getCycleStateDetails( data: &[u8], @@ -3683,17 +3701,6 @@ function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external } blockPrologue }, - { - fn processTasks( - data: &[u8], - ) -> alloy_sol_types::Result { - ::abi_decode_raw_validate( - data, - ) - .map(SupraContractsBindingsCalls::processTasks) - } - processTasks - }, { fn ifTaskExists( data: &[u8], @@ -4175,7 +4182,9 @@ the bytecode concatenated with the constructor's ABI-encoded arguments.*/ pub fn processTasks( &self, _cycleIndex: u64, - _taskIndexes: alloy::sol_types::private::Vec, + _taskIndexes: alloy::sol_types::private::Vec< + alloy::sol_types::private::primitives::aliases::U256, + >, ) -> alloy_contract::SolCallBuilder<&P, processTasksCall, N> { self.call_builder( &processTasksCall { diff --git a/crates/supra-extension/src/transactions/automation_record.rs b/crates/supra-extension/src/transactions/automation_record.rs index 6e4a1c31af..9485fc64a9 100644 --- a/crates/supra-extension/src/transactions/automation_record.rs +++ b/crates/supra-extension/src/transactions/automation_record.rs @@ -227,7 +227,7 @@ impl AutomationRecordBuilder { pub fn get_process_tasks_payload(_cycle_index: u64, _task_indexes: Vec) -> Bytes { let process_task_call = processTasksCall { _cycleIndex: _cycle_index, - _taskIndexes: _task_indexes, + _taskIndexes: _task_indexes.into_iter().map(U256::from).collect(), }; Bytes::from(process_task_call.abi_encode()) } diff --git a/solidity/supra_contracts/script/DeployDiamond.s.sol b/solidity/supra_contracts/script/DeployDiamond.s.sol index f46549e1aa..463347146e 100644 --- a/solidity/supra_contracts/script/DeployDiamond.s.sol +++ b/solidity/supra_contracts/script/DeployDiamond.s.sol @@ -39,21 +39,18 @@ contract DeployDiamond is Script { function run() external { vm.startBroadcast(); - // Deploy the Diamond, its facets and the DiamondInit - Deployment memory deployment = LibDiamondUtils.deploy(multiSig); - - // Execute the diamond cut to initialize the Diamond state - LibDiamondUtils.executeCut(vmSigner, erc20Supra, initParams, deployment); + // Deploy the Diamond, its facets and the DiamondInit and initialize the Diamond in a single transaction + Deployment memory deployment = LibDiamondUtils.deploy(multiSig, vmSigner, erc20Supra, initParams); console.log("Diamond owner:", OwnershipFacet(address(deployment.diamond)).owner()); console.log("Diamond deployed at:", address(deployment.diamond)); - console.log("DiamondCutFacet deployed at:", address(deployment.diamondCutFacet)); - console.log("DiamondLoupeFacet deployed at:", address(deployment.loupeFacet)); - console.log("OwnershipFacet deployed at:", address(deployment.ownershipFacet)); - console.log("ConfigFacet deployed at:", address(deployment.configFacet)); - console.log("RegistryFacet deployed at:", address(deployment.registryFacet)); - console.log("CoreFacet deployed at:", address(deployment.coreFacet)); - console.log("DiamondInit deployed at:", address(deployment.diamondInit)); + console.log("DiamondCutFacet deployed at:", address(deployment.facets.diamondCutFacet)); + console.log("DiamondLoupeFacet deployed at:", address(deployment.facets.loupeFacet)); + console.log("OwnershipFacet deployed at:", address(deployment.facets.ownershipFacet)); + console.log("ConfigFacet deployed at:", address(deployment.facets.configFacet)); + console.log("RegistryFacet deployed at:", address(deployment.facets.registryFacet)); + console.log("CoreFacet deployed at:", address(deployment.facets.coreFacet)); + console.log("DiamondInit deployed at:", address(deployment.facets.diamondInit)); vm.stopBroadcast(); } diff --git a/solidity/supra_contracts/script/GovActions.s.sol b/solidity/supra_contracts/script/GovActions.s.sol index 630482ca6c..a4df43311c 100644 --- a/solidity/supra_contracts/script/GovActions.s.sol +++ b/solidity/supra_contracts/script/GovActions.s.sol @@ -8,14 +8,14 @@ import {BlockMeta} from "../src/BlockMeta.sol"; contract InitializeCycleMonitoring is Script { address payable multisigWalletAddr; address blockMetadata; - address automationController; + address registry; bytes4 selector; uint64 timeout; function setUp() public { multisigWalletAddr = payable(vm.envAddress("MULTISIG_WALLET_ADDRESS")); blockMetadata = vm.envAddress("BLOCK_METADATA_ADDRESS"); - automationController = vm.envAddress("AUTOMATION_CONTROLLER"); + registry = vm.envAddress("REGISTRY"); selector = bytes4(keccak256("monitorCycleEnd()")); timeout = uint64(vm.envUint("TIMEOUT")); } @@ -28,9 +28,9 @@ contract InitializeCycleMonitoring is Script { uint256 nextTxnIndex = wallet.getNextTransactionIndex(); console.log("TxnIndex: ", nextTxnIndex); - // Submit a foundation/gov action to register automationController::monitor_cycle_event + // Submit a foundation/gov action to register registry::monitor_cycle_event // to be executed for each block - bytes memory data = abi.encodeCall(BlockMeta.register, (automationController, selector)); + bytes memory data = abi.encodeCall(BlockMeta.register, (registry, selector)); wallet.submitTransaction(blockMetadata, 0, timeout, data); vm.stopBroadcast(); diff --git a/solidity/supra_contracts/script/MintErc20Supra.s.sol b/solidity/supra_contracts/script/MintErc20Supra.s.sol index 00b16db152..19e360b2b2 100644 --- a/solidity/supra_contracts/script/MintErc20Supra.s.sol +++ b/solidity/supra_contracts/script/MintErc20Supra.s.sol @@ -18,7 +18,7 @@ contract MintErc20Supra is Script { allowance = uint64(vm.envUint("ALLOWANCE")); erc20SupraAddr = vm.envAddress("ERC20SUPRA"); erc20SupraHandlerAddr = payable(vm.envAddress("ERC20SUPRA_HANDLER")); - authority = vm.envAddress("AUTOMATION_REGISTRY"); + authority = vm.envAddress("REGISTRY"); } function run() public { @@ -35,8 +35,9 @@ contract MintErc20Supra is Script { // Then do the conversion erc20SupraHandler.deposit{value: value}(); + uint256 conf_all = erc20Supra.allowance(msg.sender, authority); - console.log("Sender: ", msg.sender); + console.log("Sender: ", msg.sender, conf_all, authority); console.log("Token balance after: ", erc20Supra.balanceOf(msg.sender)); vm.stopBroadcast(); diff --git a/solidity/supra_contracts/script/RegisterAutomationTask.s.sol b/solidity/supra_contracts/script/RegisterAutomationTask.s.sol index bb35889e0e..1474e70a52 100644 --- a/solidity/supra_contracts/script/RegisterAutomationTask.s.sol +++ b/solidity/supra_contracts/script/RegisterAutomationTask.s.sol @@ -13,7 +13,7 @@ contract RegisterAutomationTask is Script { uint64 automationFeeCap; uint128 taskMaxGas; uint128 taskGasPriceCap; - address diamond; + address registry; address erc20supra; address target; @@ -23,7 +23,7 @@ contract RegisterAutomationTask is Script { taskDurationSecs = uint64(vm.envUint("TASK_DURATION_SEC")); taskMaxGas = uint128(vm.envUint("TASK_MAX_GAS")); taskGasPriceCap = uint128(vm.envUint("TASK_GAS_PRICE_CAP")); - diamond = vm.envAddress("DIAMOND"); + registry = vm.envAddress("REGISTRY"); erc20supra = vm.envAddress("ERC20SUPRA"); target = vm.envAddress("TARGET"); automationFeeCap = uint64(vm.envUint("TASK_AUTOMATION_FEE_CAP")); @@ -36,13 +36,14 @@ contract RegisterAutomationTask is Script { function run() public { vm.startBroadcast(); - IRegistryFacet registryFacet = IRegistryFacet(diamond); + IRegistryFacet registryFacet = IRegistryFacet(registry); + IConfigFacet configFacet = IConfigFacet(registry); bytes[] memory auxData; uint64 taskIdx = registryFacet.getNextTaskIndex(); console.log("Next task index ", taskIdx); bytes memory payload = createPayload(0, target, erc20supra); - bytes memory predicate = createPredicate(diamond); + bytes memory predicate = createPredicate(registry); registryFacet.register( payload, diff --git a/solidity/supra_contracts/src/Diamond.sol b/solidity/supra_contracts/src/Diamond.sol index 59bdd96247..26334974b2 100644 --- a/solidity/supra_contracts/src/Diamond.sol +++ b/solidity/supra_contracts/src/Diamond.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.0; +pragma solidity 0.8.27; /******************************************************************************\ * Author: Nick Mudge (https://twitter.com/mudgen) @@ -8,24 +8,109 @@ pragma solidity ^0.8.0; * Implementation of a diamond. /******************************************************************************/ -import { LibDiamond } from "./libraries/LibDiamond.sol"; -import { IDiamondCut } from "./interfaces/IDiamondCut.sol"; +import {LibDiamond} from "./libraries/LibDiamond.sol"; +import {LibUtils} from "./libraries/LibUtils.sol"; +import {LibAppStorage} from "./libraries/LibAppStorage.sol"; +import {IDiamondCut} from "./interfaces/IDiamondCut.sol"; +import {IDiamondLoupe} from "./interfaces/IDiamondLoupe.sol"; +import {IFacetSelectors} from "./interfaces/IFacetSelectors.sol"; +import {DiamondInit} from "./upgradeInitializers/DiamondInit.sol"; +import {FacetsDeployment, InitParams} from "./libraries/DiamondTypes.sol"; +import { IERC173 } from "./interfaces/IERC173.sol"; +import { IERC165 } from "./interfaces/IERC165.sol"; -contract Diamond { +contract Diamond { + using LibUtils for address; - constructor(address _contractOwner, address _diamondCutFacet) { + /// @notice Deploy and fully initialize the Diamond in a single transaction. + /// @param _contractOwner Address that will own the diamond. + /// @param _d Addresses of all deployed facets and DiamondInit. + /// `_d.diamond` is ignored (this contract is the diamond). + /// @param _vmSigner VM signer address passed to DiamondInit. + /// @param _erc20Supra ERC20Supra contract address passed to DiamondInit. + /// @param _params Registry configuration passed to DiamondInit. + constructor( + address _contractOwner, + FacetsDeployment memory _d, + address _vmSigner, + address _erc20Supra, + InitParams memory _params + ) { LibDiamond.setContractOwner(_contractOwner); - // Add the diamondCut external function from the diamondCutFacet - IDiamondCut.FacetCut[] memory cut = new IDiamondCut.FacetCut[](1); - bytes4[] memory functionSelectors = new bytes4[](1); - functionSelectors[0] = IDiamondCut.diamondCut.selector; + _d.configFacet.validateContractAddress(); + _d.coreFacet.validateContractAddress(); + _d.diamondCutFacet.validateContractAddress(); + _d.registryFacet.validateContractAddress(); + _d.ownershipFacet.validateContractAddress(); + _d.diamondInit.validateContractAddress(); + + // ------------------------------------------------------------------ + // Build the full cut array: + // slot 0 — diamondCut function (from DiamondCutFacet) + // slots 1-5 — remaining facets, each self-reporting their selectors + // ------------------------------------------------------------------ + IDiamondCut.FacetCut[] memory cut = new IDiamondCut.FacetCut[](6); + + bytes4[] memory cutSelectors = new bytes4[](1); + cutSelectors[0] = IDiamondCut.diamondCut.selector; cut[0] = IDiamondCut.FacetCut({ - facetAddress: _diamondCutFacet, - action: IDiamondCut.FacetCutAction.Add, - functionSelectors: functionSelectors + facetAddress: _d.diamondCutFacet, + action: IDiamondCut.FacetCutAction.Add, + functionSelectors: cutSelectors }); - LibDiamond.diamondCut(cut, address(0), ""); + + address[5] memory facets = [ + _d.loupeFacet, + _d.ownershipFacet, + _d.configFacet, + _d.registryFacet, + _d.coreFacet + ]; + for (uint256 i = 0; i < 5; i++) { + cut[i + 1] = IDiamondCut.FacetCut({ + facetAddress: facets[i], + action: IDiamondCut.FacetCutAction.Add, + functionSelectors: IFacetSelectors(facets[i]).getSelectors() + }); + } + + // ------------------------------------------------------------------ + // Encode DiamondInit.init calldata and apply all cuts atomically + // ------------------------------------------------------------------ + bytes memory initCalldata = abi.encodeCall( + DiamondInit.init, + ( + _params.taskDurationCapSecs, + _params.registryMaxGasCap, + _params.automationBaseFeeWeiPerSec, + _params.flatRegistrationFeeWei, + _params.congestionThresholdPercentage, + _params.congestionBaseFeeWeiPerSec, + _params.congestionExponent, + _params.taskCapacity, + _params.cycleDurationSecs, + _params.sysTaskDurationCapSecs, + _params.sysRegistryMaxGasCap, + _params.sysTaskCapacity, + _vmSigner, + _erc20Supra, + _params.automationEnabled, + _params.registrationEnabled + ) + ); + + LibDiamond.diamondCut(cut, _d.diamondInit, initCalldata); + } + + /// @notice Returns true if the automation feature is enabled and the diamond has been initialized. + function is_feature_enabled_and_initialized() external view returns (bool) { + LibDiamond.DiamondStorage storage ds = LibDiamond.diamondStorage(); + bool initialized = ds.supportedInterfaces[type(IERC165).interfaceId] && + ds.supportedInterfaces[type(IDiamondCut).interfaceId] && + ds.supportedInterfaces[type(IDiamondLoupe).interfaceId] && + ds.supportedInterfaces[type(IERC173).interfaceId]; + return initialized && LibAppStorage.appStorage().automationEnabled; } // Find facet for function that is called and execute the @@ -50,12 +135,8 @@ contract Diamond { returndatacopy(0, 0, returndatasize()) // return any return value or error back to the caller switch result - case 0 { - revert(0, returndatasize()) - } - default { - return(0, returndatasize()) - } + case 0 { revert(0, returndatasize()) } + default { return(0, returndatasize()) } } } -} +} \ No newline at end of file diff --git a/solidity/supra_contracts/src/SupraContractsBindings.sol b/solidity/supra_contracts/src/SupraContractsBindings.sol index 718b0969dc..8b5df3987c 100644 --- a/solidity/supra_contracts/src/SupraContractsBindings.sol +++ b/solidity/supra_contracts/src/SupraContractsBindings.sol @@ -18,7 +18,7 @@ interface SupraContractsBindings { function getCycleStateDetails() external view returns (LibCommon.CycleDetails memory); // Entry function to be called by node runtime for bookkeeping - function processTasks(uint64 _cycleIndex, uint64[] memory _taskIndexes) external; + function processTasks(uint64 _cycleIndex, uint256[] memory _taskIndexes) external; // Entry function of the BlockMeta for block metadata transaction function blockPrologue() external; diff --git a/solidity/supra_contracts/src/facets/ConfigFacet.sol b/solidity/supra_contracts/src/facets/ConfigFacet.sol index f9cc25a694..476988ecee 100644 --- a/solidity/supra_contracts/src/facets/ConfigFacet.sol +++ b/solidity/supra_contracts/src/facets/ConfigFacet.sol @@ -5,14 +5,15 @@ import {AppStorage, Config, RegistryState, LibAppStorage} from "../libraries/Lib import {LibCommon} from "../libraries/LibCommon.sol"; import {LibUtils} from "../libraries/LibUtils.sol"; import {IConfigFacet} from "../interfaces/IConfigFacet.sol"; +import {IFacetSelectors} from "../interfaces/IFacetSelectors.sol"; import {LibDiamond} from "../libraries/LibDiamond.sol"; import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; -contract ConfigFacet is IConfigFacet { +contract ConfigFacet is IConfigFacet, IFacetSelectors { using EnumerableSet for *; - /// @dev State variables + /// @dev State variables AppStorage internal s; // ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ADMIN FUNCTIONS ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: @@ -159,4 +160,19 @@ contract ConfigFacet is IConfigFacet { function getConfigBuffer() external view returns (Config memory) { return LibAppStorage.bufferConfig(); } + + function getSelectors() external pure override returns (bytes4[] memory selectors) { + selectors = new bytes4[](11); + selectors[0] = ConfigFacet.grantAuthorization.selector; + selectors[1] = ConfigFacet.revokeAuthorization.selector; + selectors[2] = ConfigFacet.enableRegistration.selector; + selectors[3] = ConfigFacet.disableRegistration.selector; + selectors[4] = ConfigFacet.withdrawFees.selector; + selectors[5] = ConfigFacet.updateConfigBuffer.selector; + selectors[6] = ConfigFacet.getVmSigner.selector; + selectors[7] = ConfigFacet.erc20Supra.selector; + selectors[8] = ConfigFacet.isRegistrationEnabled.selector; + selectors[9] = ConfigFacet.getConfig.selector; + selectors[10] = ConfigFacet.getConfigBuffer.selector; + } } \ No newline at end of file diff --git a/solidity/supra_contracts/src/facets/CoreFacet.sol b/solidity/supra_contracts/src/facets/CoreFacet.sol index e9f02f9e15..99b76a29a9 100644 --- a/solidity/supra_contracts/src/facets/CoreFacet.sol +++ b/solidity/supra_contracts/src/facets/CoreFacet.sol @@ -6,10 +6,11 @@ import {LibCommon} from "../libraries/LibCommon.sol"; import {LibCore} from "../libraries/LibCore.sol"; import {LibUtils} from "../libraries/LibUtils.sol"; import {ICoreFacet} from "../interfaces/ICoreFacet.sol"; +import {IFacetSelectors} from "../interfaces/IFacetSelectors.sol"; import {LibDiamond} from "../libraries/LibDiamond.sol"; import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; -contract CoreFacet is ICoreFacet { +contract CoreFacet is ICoreFacet, IFacetSelectors { using LibUtils for address; using EnumerableSet for EnumerableSet.UintSet; @@ -130,7 +131,21 @@ contract CoreFacet is ICoreFacet { function removeRegisteredTask(uint64 _taskIndex, string memory _reason) external { // Check caller is VM Signer msg.sender.enforceIsVmSigner(s.vmSigner); - + LibCore.handleTaskRemoval(_taskIndex, _reason); } + + function getSelectors() external pure override returns (bytes4[] memory selectors) { + selectors = new bytes4[](10); + selectors[0] = CoreFacet.processTasks.selector; + selectors[1] = CoreFacet.monitorCycleEnd.selector; + selectors[2] = CoreFacet.enableAutomation.selector; + selectors[3] = CoreFacet.disableAutomation.selector; + selectors[4] = CoreFacet.removeRegisteredTask.selector; + selectors[5] = CoreFacet.getCycleInfo.selector; + selectors[6] = CoreFacet.getCycleDuration.selector; + selectors[7] = CoreFacet.getTransitionInfo.selector; + selectors[8] = CoreFacet.isAutomationEnabled.selector; + selectors[9] = CoreFacet.getCycleStateDetails.selector; + } } diff --git a/solidity/supra_contracts/src/facets/DiamondLoupeFacet.sol b/solidity/supra_contracts/src/facets/DiamondLoupeFacet.sol index 538516f91a..079a8727f1 100644 --- a/solidity/supra_contracts/src/facets/DiamondLoupeFacet.sol +++ b/solidity/supra_contracts/src/facets/DiamondLoupeFacet.sol @@ -8,11 +8,13 @@ pragma solidity ^0.8.0; import { LibDiamond } from "../libraries/LibDiamond.sol"; import { IDiamondLoupe } from "../interfaces/IDiamondLoupe.sol"; import { IERC165 } from "../interfaces/IERC165.sol"; +import { IFacetSelectors } from "../interfaces/IFacetSelectors.sol"; // The functions in DiamondLoupeFacet MUST be added to a diamond. // The EIP-2535 Diamond standard requires these functions. -contract DiamondLoupeFacet is IDiamondLoupe, IERC165 { +contract DiamondLoupeFacet is IDiamondLoupe, IERC165, IFacetSelectors { + // Diamond Loupe Functions //////////////////////////////////////////////////////////////////// /// These functions are expected to be called frequently by tools. @@ -64,4 +66,13 @@ contract DiamondLoupeFacet is IDiamondLoupe, IERC165 { LibDiamond.DiamondStorage storage ds = LibDiamond.diamondStorage(); return ds.supportedInterfaces[_interfaceId]; } + + function getSelectors() external pure override returns (bytes4[] memory s) { + s = new bytes4[](5); + s[0] = DiamondLoupeFacet.facets.selector; + s[1] = DiamondLoupeFacet.facetFunctionSelectors.selector; + s[2] = DiamondLoupeFacet.facetAddresses.selector; + s[3] = DiamondLoupeFacet.facetAddress.selector; + s[4] = DiamondLoupeFacet.supportsInterface.selector; + } } diff --git a/solidity/supra_contracts/src/facets/OwnershipFacet.sol b/solidity/supra_contracts/src/facets/OwnershipFacet.sol index 45cba09baa..a68d0ded76 100644 --- a/solidity/supra_contracts/src/facets/OwnershipFacet.sol +++ b/solidity/supra_contracts/src/facets/OwnershipFacet.sol @@ -3,8 +3,10 @@ pragma solidity ^0.8.0; import { LibDiamond } from "../libraries/LibDiamond.sol"; import { IERC173 } from "../interfaces/IERC173.sol"; +import { IFacetSelectors } from "../interfaces/IFacetSelectors.sol"; + +contract OwnershipFacet is IERC173, IFacetSelectors { -contract OwnershipFacet is IERC173 { function transferOwnership(address _newOwner) external override { LibDiamond.enforceIsContractOwner(); LibDiamond.setContractOwner(_newOwner); @@ -13,4 +15,10 @@ contract OwnershipFacet is IERC173 { function owner() external override view returns (address owner_) { owner_ = LibDiamond.contractOwner(); } + + function getSelectors() external pure override returns (bytes4[] memory s) { + s = new bytes4[](2); + s[0] = OwnershipFacet.owner.selector; + s[1] = OwnershipFacet.transferOwnership.selector; + } } diff --git a/solidity/supra_contracts/src/facets/RegistryFacet.sol b/solidity/supra_contracts/src/facets/RegistryFacet.sol index 9bc687eca6..5ecf87d35c 100644 --- a/solidity/supra_contracts/src/facets/RegistryFacet.sol +++ b/solidity/supra_contracts/src/facets/RegistryFacet.sol @@ -6,10 +6,11 @@ import {LibAccounting} from "../libraries/LibAccounting.sol"; import {LibCommon} from "../libraries/LibCommon.sol"; import {LibRegistry} from "../libraries/LibRegistry.sol"; import {IRegistryFacet} from "../interfaces/IRegistryFacet.sol"; +import {IFacetSelectors} from "../interfaces/IFacetSelectors.sol"; import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; -contract RegistryFacet is IRegistryFacet { +contract RegistryFacet is IRegistryFacet, IFacetSelectors { using EnumerableSet for *; /// @dev State variables @@ -408,4 +409,44 @@ contract RegistryFacet is IRegistryFacet { _committedOccupancy ); } + + function getSelectors() external pure override returns (bytes4[] memory selectors) { + selectors = new bytes4[](36); + selectors[0] = RegistryFacet.register.selector; + selectors[1] = RegistryFacet.registerSystemTask.selector; + selectors[2] = RegistryFacet.cancelTasks.selector; + selectors[3] = RegistryFacet.cancelSystemTasks.selector; + selectors[4] = RegistryFacet.stopTasks.selector; + selectors[5] = RegistryFacet.stopSystemTasks.selector; + selectors[6] = RegistryFacet.getTaskIdList.selector; + selectors[7] = RegistryFacet.getSystemTaskIds.selector; + selectors[8] = RegistryFacet.getTaskOwner.selector; + selectors[9] = RegistryFacet.getNextTaskIndex.selector; + selectors[10] = RegistryFacet.totalTasks.selector; + selectors[11] = RegistryFacet.totalSystemTasks.selector; + selectors[12] = RegistryFacet.getTaskDetails.selector; + selectors[13] = RegistryFacet.getTaskDetailsBulk.selector; + selectors[14] = this.isAuthorizedSubmitter.selector; + selectors[15] = RegistryFacet.getTotalActiveTasks.selector; + selectors[16] = RegistryFacet.getActiveTaskIds.selector; + selectors[17] = this.hasActiveUserTask.selector; + selectors[18] = this.hasActiveSystemTask.selector; + selectors[19] = this.hasActiveTaskOfType.selector; + selectors[20] = RegistryFacet.getGasCommittedForNextCycle.selector; + selectors[21] = RegistryFacet.getGasCommittedForCurrentCycle.selector; + selectors[22] = RegistryFacet.getSystemGasCommittedForNextCycle.selector; + selectors[23] = RegistryFacet.getSystemGasCommittedForCurrentCycle.selector; + selectors[24] = RegistryFacet.getNextCycleRegistryMaxGasCap.selector; + selectors[25] = RegistryFacet.getNextCycleSysRegistryMaxGasCap.selector; + selectors[26] = RegistryFacet.getCycleLockedFees.selector; + selectors[27] = RegistryFacet.getTotalDepositedAutomationFees.selector; + selectors[28] = RegistryFacet.getTotalLockedBalance.selector; + selectors[29] = RegistryFacet.calculateAutomationFeeMultiplierForCommittedOccupancy.selector; + selectors[30] = RegistryFacet.calculateAutomationFeeMultiplierForCurrentCycle.selector; + selectors[31] = RegistryFacet.estimateAutomationFee.selector; + selectors[32] = RegistryFacet.estimateAutomationFeeWithCommittedOccupancy.selector; + selectors[33] = RegistryFacet.ifTaskExists.selector; + selectors[34] = RegistryFacet.ifSysTaskExists.selector; + selectors[35] = RegistryFacet.getTasksByAddress.selector; + } } diff --git a/solidity/supra_contracts/src/interfaces/IFacetSelectors.sol b/solidity/supra_contracts/src/interfaces/IFacetSelectors.sol new file mode 100644 index 0000000000..418b2e17d9 --- /dev/null +++ b/solidity/supra_contracts/src/interfaces/IFacetSelectors.sol @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.27; + +/// @notice Implemented by every facet so the Diamond constructor can +/// retrieve its function selectors without a central registry. +interface IFacetSelectors { + function getSelectors() external pure returns (bytes4[] memory); +} \ No newline at end of file diff --git a/solidity/supra_contracts/src/libraries/DiamondTypes.sol b/solidity/supra_contracts/src/libraries/DiamondTypes.sol new file mode 100644 index 0000000000..f9bab03c46 --- /dev/null +++ b/solidity/supra_contracts/src/libraries/DiamondTypes.sol @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.27; + +struct FacetsDeployment { + address diamondCutFacet; + address loupeFacet; + address ownershipFacet; + address configFacet; + address registryFacet; + address coreFacet; + address diamondInit; +} + +struct InitParams { + uint64 taskDurationCapSecs; + uint128 registryMaxGasCap; + uint128 automationBaseFeeWeiPerSec; + uint128 flatRegistrationFeeWei; + uint8 congestionThresholdPercentage; + uint128 congestionBaseFeeWeiPerSec; + uint8 congestionExponent; + uint16 taskCapacity; + uint64 cycleDurationSecs; + uint64 sysTaskDurationCapSecs; + uint128 sysRegistryMaxGasCap; + uint16 sysTaskCapacity; + bool automationEnabled; + bool registrationEnabled; +} diff --git a/solidity/supra_contracts/src/libraries/LibDiamondUtils.sol b/solidity/supra_contracts/src/libraries/LibDiamondUtils.sol index 03b5c6e2c1..01d49d4c42 100644 --- a/solidity/supra_contracts/src/libraries/LibDiamondUtils.sol +++ b/solidity/supra_contracts/src/libraries/LibDiamondUtils.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.27; +pragma solidity ^0.8.27; import {Diamond} from "../Diamond.sol"; import {DiamondCutFacet} from "../facets/DiamondCutFacet.sol"; @@ -9,40 +9,13 @@ import {ConfigFacet} from "../facets/ConfigFacet.sol"; import {RegistryFacet} from "../facets/RegistryFacet.sol"; import {CoreFacet} from "../facets/CoreFacet.sol"; import {DiamondInit} from "../upgradeInitializers/DiamondInit.sol"; -import {IDiamondCut} from "../interfaces/IDiamondCut.sol"; - -// ============================================================= -// STRUCTS -// ============================================================= +import {FacetsDeployment, InitParams} from "../libraries/DiamondTypes.sol"; struct Deployment { - address diamondCutFacet; + FacetsDeployment facets; address diamond; - address loupeFacet; - address ownershipFacet; - address configFacet; - address registryFacet; - address coreFacet; - address diamondInit; } -struct InitParams { - uint64 taskDurationCapSecs; - uint128 registryMaxGasCap; - uint128 automationBaseFeeWeiPerSec; - uint128 flatRegistrationFeeWei; - uint8 congestionThresholdPercentage; - uint128 congestionBaseFeeWeiPerSec; - uint8 congestionExponent; - uint16 taskCapacity; - uint64 cycleDurationSecs; - uint64 sysTaskDurationCapSecs; - uint128 sysRegistryMaxGasCap; - uint16 sysTaskCapacity; - bool automationEnabled; - bool registrationEnabled; -} - library LibDiamondUtils { // ============================================================= @@ -72,215 +45,33 @@ library LibDiamondUtils { // DEPLOY FUNCTION // ============================================================= - function deploy(address _owner) internal returns (Deployment memory d) { - - // 1) Deploy DiamondCutFacet - DiamondCutFacet cutFacet = new DiamondCutFacet(); - d.diamondCutFacet = address(cutFacet); - - // 2) Deploy Diamond - Diamond diamond = new Diamond(_owner, address(cutFacet)); - d.diamond = address(diamond); - - // 3. Deploy other facets - DiamondLoupeFacet loupeFacet = new DiamondLoupeFacet(); - OwnershipFacet ownershipFacet = new OwnershipFacet(); - ConfigFacet configFacet = new ConfigFacet(); - RegistryFacet registryFacet = new RegistryFacet(); - CoreFacet coreFacet = new CoreFacet(); - - d.loupeFacet = address(loupeFacet); - d.ownershipFacet = address(ownershipFacet); - d.configFacet = address(configFacet); - d.registryFacet = address(registryFacet); - d.coreFacet = address(coreFacet); - - // 4) Deploy DiamondInit - DiamondInit diamondInit = new DiamondInit(); - d.diamondInit = address(diamondInit); - } - - // ============================================================= - // EXECUTE DIAMOND CUT - // ============================================================= - - function executeCut( + /// @notice Deploys all facets, DiamondInit, and a fully-initialized Diamond + /// in a single call. The Diamond constructor applies all facet cuts + /// and runs DiamondInit atomically. + function deploy( + address _owner, address _vmSigner, address _erc20Supra, - InitParams memory _params, - Deployment memory _deployment - ) internal { - - // 1) Build the facet cuts - IDiamondCut.FacetCut[] memory cut = buildFacetCuts( - _deployment.loupeFacet, - _deployment.ownershipFacet, - _deployment.configFacet, - _deployment.registryFacet, - _deployment.coreFacet - ); - - // 2) Prepare init calldata for DiamondInit - bytes memory initCalldata = abi.encodeCall( - DiamondInit.init, - ( - _params, - _vmSigner, - _erc20Supra - ) - ); - - // 3) Execute diamondCut to add all the facets and initialize the state - IDiamondCut(_deployment.diamond).diamondCut( - cut, - _deployment.diamondInit, - initCalldata - ); + InitParams memory _params + ) internal returns (Deployment memory d) { + d.facets = deploy_facets(); + d.diamond = address (new Diamond(_owner, d.facets, _vmSigner, _erc20Supra, _params)); } + /// @notice Deploys all facets, DiamondInit. + function deploy_facets() internal returns (FacetsDeployment memory d) { - // ============================================================= - // FACET CUT BUILDER - // ============================================================= - - function buildFacetCuts( - address loupeFacet, - address ownershipFacet, - address configFacet, - address registryFacet, - address coreFacet - ) internal pure returns (IDiamondCut.FacetCut[] memory cut) { - cut = new IDiamondCut.FacetCut[](5); - - // ------------------------------------------------------------ - // DiamondLoupeFacet - // ------------------------------------------------------------ - { - bytes4[] memory selectors = new bytes4[](5); - selectors[0] = DiamondLoupeFacet.facets.selector; - selectors[1] = DiamondLoupeFacet.facetFunctionSelectors.selector; - selectors[2] = DiamondLoupeFacet.facetAddresses.selector; - selectors[3] = DiamondLoupeFacet.facetAddress.selector; - selectors[4] = DiamondLoupeFacet.supportsInterface.selector; - - cut[0] = IDiamondCut.FacetCut({ - facetAddress: loupeFacet, - action: IDiamondCut.FacetCutAction.Add, - functionSelectors: selectors - }); - } - - // ------------------------------------------------------------ - // OwnershipFacet - // ------------------------------------------------------------ - { - bytes4[] memory selectors = new bytes4[](2); - selectors[0] = OwnershipFacet.owner.selector; - selectors[1] = OwnershipFacet.transferOwnership.selector; - - cut[1] = IDiamondCut.FacetCut({ - facetAddress: ownershipFacet, - action: IDiamondCut.FacetCutAction.Add, - functionSelectors: selectors - }); - } - - // ------------------------------------------------------------ - // ConfigFacet - // ------------------------------------------------------------ - { - bytes4[] memory selectors = new bytes4[](11); - selectors[0] = ConfigFacet.grantAuthorization.selector; - selectors[1] = ConfigFacet.revokeAuthorization.selector; - selectors[2] = ConfigFacet.enableRegistration.selector; - selectors[3] = ConfigFacet.disableRegistration.selector; - selectors[4] = ConfigFacet.withdrawFees.selector; - selectors[5] = ConfigFacet.updateConfigBuffer.selector; - - selectors[6] = ConfigFacet.getVmSigner.selector; - selectors[7] = ConfigFacet.erc20Supra.selector; - selectors[8] = ConfigFacet.isRegistrationEnabled.selector; - selectors[9] = ConfigFacet.getConfig.selector; - selectors[10] = ConfigFacet.getConfigBuffer.selector; - - cut[2] = IDiamondCut.FacetCut({ - facetAddress: configFacet, - action: IDiamondCut.FacetCutAction.Add, - functionSelectors: selectors - }); - } - - // ------------------------------------------------------------ - // RegistryFacet - // ------------------------------------------------------------ - { - bytes4[] memory selectors = new bytes4[](36); - selectors[0] = RegistryFacet.register.selector; - selectors[1] = RegistryFacet.registerSystemTask.selector; - selectors[2] = RegistryFacet.cancelTasks.selector; - selectors[3] = RegistryFacet.cancelSystemTasks.selector; - selectors[4] = RegistryFacet.stopTasks.selector; - selectors[5] = RegistryFacet.stopSystemTasks.selector; + // 1) Deploy DiamondCutFacet + d.diamondCutFacet = address(new DiamondCutFacet()); - selectors[6] = RegistryFacet.getTaskIdList.selector; - selectors[7] = RegistryFacet.getSystemTaskIds.selector; - selectors[8] = RegistryFacet.getTaskOwner.selector; - selectors[9] = RegistryFacet.getNextTaskIndex.selector; - selectors[10] = RegistryFacet.totalTasks.selector; - selectors[11] = RegistryFacet.totalSystemTasks.selector; - selectors[12] = RegistryFacet.getTaskDetails.selector; - selectors[13] = RegistryFacet.getTaskDetailsBulk.selector; - selectors[14] = RegistryFacet.isAuthorizedSubmitter.selector; - selectors[15] = RegistryFacet.getTotalActiveTasks.selector; - selectors[16] = RegistryFacet.getActiveTaskIds.selector; - selectors[17] = RegistryFacet.hasActiveUserTask.selector; - selectors[18] = RegistryFacet.hasActiveSystemTask.selector; - selectors[19] = RegistryFacet.hasActiveTaskOfType.selector; - selectors[20] = RegistryFacet.getGasCommittedForNextCycle.selector; - selectors[21] = RegistryFacet.getGasCommittedForCurrentCycle.selector; - selectors[22] = RegistryFacet.getSystemGasCommittedForNextCycle.selector; - selectors[23] = RegistryFacet.getSystemGasCommittedForCurrentCycle.selector; - selectors[24] = RegistryFacet.getNextCycleRegistryMaxGasCap.selector; - selectors[25] = RegistryFacet.getNextCycleSysRegistryMaxGasCap.selector; - selectors[26] = RegistryFacet.getCycleLockedFees.selector; - selectors[27] = RegistryFacet.getTotalDepositedAutomationFees.selector; - selectors[28] = RegistryFacet.getTotalLockedBalance.selector; - selectors[29] = RegistryFacet.calculateAutomationFeeMultiplierForCommittedOccupancy.selector; - selectors[30] = RegistryFacet.calculateAutomationFeeMultiplierForCurrentCycle.selector; - selectors[31] = RegistryFacet.estimateAutomationFee.selector; - selectors[32] = RegistryFacet.estimateAutomationFeeWithCommittedOccupancy.selector; - selectors[33] = RegistryFacet.ifTaskExists.selector; - selectors[34] = RegistryFacet.ifSysTaskExists.selector; - selectors[35] = RegistryFacet.getTasksByAddress.selector; + // 2) Deploy remaining facets + d.loupeFacet = address(new DiamondLoupeFacet()); + d.ownershipFacet = address(new OwnershipFacet()); + d.configFacet = address(new ConfigFacet()); + d.registryFacet = address(new RegistryFacet()); + d.coreFacet = address(new CoreFacet()); - cut[3] = IDiamondCut.FacetCut({ - facetAddress: registryFacet, - action: IDiamondCut.FacetCutAction.Add, - functionSelectors: selectors - }); - } - - // ------------------------------------------------------------ - // CoreFacet - // ------------------------------------------------------------ - { - bytes4[] memory selectors = new bytes4[](10); - selectors[0] = CoreFacet.processTasks.selector; - selectors[1] = CoreFacet.monitorCycleEnd.selector; - selectors[2] = CoreFacet.enableAutomation.selector; - selectors[3] = CoreFacet.disableAutomation.selector; - selectors[4] = CoreFacet.removeRegisteredTask.selector; - selectors[5] = CoreFacet.getCycleInfo.selector; - selectors[6] = CoreFacet.getCycleDuration.selector; - selectors[7] = CoreFacet.getTransitionInfo.selector; - selectors[8] = CoreFacet.isAutomationEnabled.selector; - selectors[9] = CoreFacet.getCycleStateDetails.selector; - - cut[4] = IDiamondCut.FacetCut({ - facetAddress: coreFacet, - action: IDiamondCut.FacetCutAction.Add, - functionSelectors: selectors - }); - } + // 3) Deploy DiamondInit + d.diamondInit = address(new DiamondInit()); } -} +} \ No newline at end of file diff --git a/solidity/supra_contracts/src/upgradeInitializers/DiamondInit.sol b/solidity/supra_contracts/src/upgradeInitializers/DiamondInit.sol index c3b5f2e37e..6f2a05d997 100644 --- a/solidity/supra_contracts/src/upgradeInitializers/DiamondInit.sol +++ b/solidity/supra_contracts/src/upgradeInitializers/DiamondInit.sol @@ -117,4 +117,5 @@ contract DiamondInit { registryState.nextCycleRegistryMaxGasCap = _params.registryMaxGasCap; registryState.nextCycleSysRegistryMaxGasCap = _params.sysRegistryMaxGasCap; } + } diff --git a/solidity/supra_contracts/test/BaseDiamondTest.t.sol b/solidity/supra_contracts/test/BaseDiamondTest.t.sol index b19bd783f6..0a69a888be 100644 --- a/solidity/supra_contracts/test/BaseDiamondTest.t.sol +++ b/solidity/supra_contracts/test/BaseDiamondTest.t.sol @@ -44,8 +44,7 @@ abstract contract BaseDiamondTest is Test { erc20SupraHandler = ERC20SupraHandler(payable(address(proxy))); defaultParams = LibDiamondUtils.defaultInitParams(); - deployment = LibDiamondUtils.deploy(admin); - LibDiamondUtils.executeCut(LibUtils.VM_SIGNER, address(erc20Supra), defaultParams, deployment); + deployment = LibDiamondUtils.deploy(admin, LibUtils.VM_SIGNER, address(erc20Supra), defaultParams); diamondAddr = deployment.diamond; IConfigFacet(diamondAddr).grantAuthorization(bob); diff --git a/solidity/supra_contracts/test/CoreFacet.t.sol b/solidity/supra_contracts/test/CoreFacet.t.sol index 64d454fbef..fe7bf95b71 100644 --- a/solidity/supra_contracts/test/CoreFacet.t.sol +++ b/solidity/supra_contracts/test/CoreFacet.t.sol @@ -55,8 +55,7 @@ contract CoreFacetTest is BaseDiamondTest { automationEnabled: false }); - Deployment memory deployment = LibDiamondUtils.deploy(admin); - LibDiamondUtils.executeCut(LibUtils.VM_SIGNER, address(erc20Supra), initParams, deployment); + Deployment memory deployment = LibDiamondUtils.deploy(admin, LibUtils.VM_SIGNER, address(erc20Supra), initParams); address diamondAddr = deployment.diamond; vm.stopPrank(); diff --git a/solidity/supra_contracts/test/DiamondInit.t.sol b/solidity/supra_contracts/test/DiamondInit.t.sol index fc3699034c..0a4b929c1e 100644 --- a/solidity/supra_contracts/test/DiamondInit.t.sol +++ b/solidity/supra_contracts/test/DiamondInit.t.sol @@ -6,7 +6,7 @@ import {OwnershipFacet} from "../src/facets/OwnershipFacet.sol"; import {LibCommon} from "../src/libraries/LibCommon.sol"; import {LibUtils} from "../src/libraries/LibUtils.sol"; import {Config} from "../src/libraries/LibAppStorage.sol"; -import {Deployment, InitParams, LibDiamondUtils} from "../src/libraries/LibDiamondUtils.sol"; +import {FacetsDeployment, Deployment, InitParams, LibDiamondUtils} from "../src/libraries/LibDiamondUtils.sol"; import {IConfigFacet} from "../src/interfaces/IConfigFacet.sol"; import {IRegistryFacet} from "../src/interfaces/IRegistryFacet.sol"; import {ICoreFacet} from "../src/interfaces/ICoreFacet.sol"; @@ -15,6 +15,7 @@ import {IDiamondLoupe} from "../src/interfaces/IDiamondLoupe.sol"; import {IERC173} from "../src/interfaces/IERC173.sol"; import {IERC165} from "../src/interfaces/IERC165.sol"; import {DiamondInit} from "../src/upgradeInitializers/DiamondInit.sol"; +import {Diamond} from "../src//Diamond.sol"; contract DiamondInitTest is BaseDiamondTest { @@ -105,11 +106,11 @@ contract DiamondInitTest is BaseDiamondTest { bool coreExists; for (uint i; i < facets.length; i++) { - if (facets[i] == deployment.diamondCutFacet) diamondCutExists = true; - if (facets[i] == deployment.loupeFacet) loupeExists = true; - if (facets[i] == deployment.ownershipFacet) ownershipExists = true; - if (facets[i] == deployment.registryFacet) registryExists = true; - if (facets[i] == deployment.coreFacet) coreExists = true; + if (facets[i] == deployment.facets.diamondCutFacet) diamondCutExists = true; + if (facets[i] == deployment.facets.loupeFacet) loupeExists = true; + if (facets[i] == deployment.facets.ownershipFacet) ownershipExists = true; + if (facets[i] == deployment.facets.registryFacet) registryExists = true; + if (facets[i] == deployment.facets.coreFacet) coreExists = true; } assertTrue(diamondCutExists); @@ -123,17 +124,17 @@ contract DiamondInitTest is BaseDiamondTest { function testSelectorRouting() public view { assertEq( IDiamondLoupe(diamondAddr).facetAddress(IRegistryFacet.register.selector), - deployment.registryFacet + deployment.facets.registryFacet ); assertEq( IDiamondLoupe(diamondAddr).facetAddress(ICoreFacet.enableAutomation.selector), - deployment.coreFacet + deployment.facets.coreFacet ); assertEq( IDiamondLoupe(diamondAddr).facetAddress(OwnershipFacet.transferOwnership.selector), - deployment.ownershipFacet + deployment.facets.ownershipFacet ); } @@ -229,7 +230,7 @@ contract DiamondInitTest is BaseDiamondTest { IDiamondCut.FacetCut[] memory cut = new IDiamondCut.FacetCut[](1); cut[0] = IDiamondCut.FacetCut({ - facetAddress: deployment.registryFacet, + facetAddress: deployment.facets.registryFacet, action: IDiamondCut.FacetCutAction.Add, functionSelectors: selectors }); @@ -260,7 +261,7 @@ contract DiamondInitTest is BaseDiamondTest { /// @dev Test to ensure removing a selector works correclty. function testRemoveSelector() public { - uint256 numSelectorsBefore = IDiamondLoupe(diamondAddr).facetFunctionSelectors(deployment.registryFacet).length; + uint256 numSelectorsBefore = IDiamondLoupe(diamondAddr).facetFunctionSelectors(deployment.facets.registryFacet).length; bytes4[] memory selectors = new bytes4[](1); selectors[0] = IRegistryFacet.cancelTasks.selector; @@ -279,7 +280,7 @@ contract DiamondInitTest is BaseDiamondTest { address facet = IDiamondLoupe(diamondAddr).facetAddress(IRegistryFacet.cancelTasks.selector); assertEq(facet, address(0)); - uint256 numSelectorsAfter = IDiamondLoupe(diamondAddr).facetFunctionSelectors(deployment.registryFacet).length; + uint256 numSelectorsAfter = IDiamondLoupe(diamondAddr).facetFunctionSelectors(deployment.facets.registryFacet).length; assertEq(numSelectorsAfter, numSelectorsBefore - 1); uint64[] memory taskIndexes = new uint64[](1); @@ -341,7 +342,7 @@ contract DiamondInitTest is BaseDiamondTest { IDiamondCut.FacetCut[] memory cut = new IDiamondCut.FacetCut[](1); cut[0] = IDiamondCut.FacetCut({ - facetAddress: deployment.configFacet, + facetAddress: deployment.facets.configFacet, action: IDiamondCut.FacetCutAction.Replace, functionSelectors: selectors }); @@ -355,43 +356,38 @@ contract DiamondInitTest is BaseDiamondTest { /// @dev Test to ensure initialization fails if zero address is passed as VM Signer. function testInitializeRevertsIfVmSignerZero() public { vm.startPrank(admin); - Deployment memory deployment = LibDiamondUtils.deploy(admin); - + FacetsDeployment memory facets = LibDiamondUtils.deploy_facets(); vm.expectRevert(LibUtils.AddressCannotBeZero.selector); - // address(0) as VM signer - LibDiamondUtils.executeCut(address(0), address(erc20Supra), defaultParams, deployment); + new Diamond(admin, facets, + address(0), address(erc20Supra), defaultParams); vm.stopPrank(); } /// @dev Test to ensure initialization fails if ERC20Supra address is zero. function testInitializeRevertsIfErc20SupraIsZero() public { vm.startPrank(admin); - Deployment memory deployment = LibDiamondUtils.deploy(admin); - + FacetsDeployment memory facets = LibDiamondUtils.deploy_facets(); vm.expectRevert(LibUtils.AddressCannotBeZero.selector); - // address(0) as ERC20Supra - LibDiamondUtils.executeCut(LibUtils.VM_SIGNER, address(0), defaultParams, deployment); + new Diamond(admin, facets, LibUtils.VM_SIGNER, address(0), defaultParams); vm.stopPrank(); } /// @dev Test to ensure initialization fails if EOA is passed as ERC20Supra address. function testInitializeRevertsIfErc20SupraIsEoa() public { vm.startPrank(admin); - Deployment memory deployment = LibDiamondUtils.deploy(admin); - + FacetsDeployment memory facets = LibDiamondUtils.deploy_facets(); vm.expectRevert(LibUtils.AddressCannotBeEOA.selector); - // EOA address as ERC20Supra - LibDiamondUtils.executeCut(LibUtils.VM_SIGNER, admin, defaultParams, deployment); + new Diamond(admin, facets, LibUtils.VM_SIGNER, admin, defaultParams); vm.stopPrank(); } /// @dev Test to ensure initialization fails if task duration is <= cycle duration. function testInitializeRevertsIfInvalidTaskDuration() public { vm.startPrank(admin); - Deployment memory deployment = LibDiamondUtils.deploy(admin); + FacetsDeployment memory facets = LibDiamondUtils.deploy_facets(); InitParams memory initParams = InitParams({ taskDurationCapSecs: 1200, @@ -409,18 +405,17 @@ contract DiamondInitTest is BaseDiamondTest { registrationEnabled: true, automationEnabled: true }); - - vm.expectRevert(LibCommon.InvalidTaskDuration.selector); - LibDiamondUtils.executeCut(LibUtils.VM_SIGNER, address(erc20Supra), initParams, deployment); + vm.expectRevert(LibCommon.InvalidTaskDuration.selector); + new Diamond(admin, facets, LibUtils.VM_SIGNER, address(erc20Supra), initParams); vm.stopPrank(); } /// @dev Test to ensure initialization fails if registry max gas cap is zero. function testInitializeRevertsIfRegistryMaxGasCapZero() public { vm.startPrank(admin); - Deployment memory deployment = LibDiamondUtils.deploy(admin); - + FacetsDeployment memory facets = LibDiamondUtils.deploy_facets(); + InitParams memory initParams = InitParams({ taskDurationCapSecs: 3600 * 24 * 7, registryMaxGasCap: 0, @@ -436,19 +431,18 @@ contract DiamondInitTest is BaseDiamondTest { sysTaskCapacity: 100, registrationEnabled: true, automationEnabled: true - }); + }); vm.expectRevert(LibCommon.InvalidRegistryMaxGasCap.selector); - - LibDiamondUtils.executeCut(LibUtils.VM_SIGNER, address(erc20Supra), initParams, deployment); + new Diamond(admin, facets, LibUtils.VM_SIGNER, address(erc20Supra), initParams); vm.stopPrank(); } /// @dev Test to ensure initialization fails if congestion threshold percentage is > 100. function testInitializeRevertsIfInvalidCongestionThreshold() public { vm.startPrank(admin); - Deployment memory deployment = LibDiamondUtils.deploy(admin); - + FacetsDeployment memory facets = LibDiamondUtils.deploy_facets(); + InitParams memory initParams = InitParams({ taskDurationCapSecs: 3600 * 24 * 7, registryMaxGasCap: 20_000_000, @@ -464,18 +458,17 @@ contract DiamondInitTest is BaseDiamondTest { sysTaskCapacity: 100, registrationEnabled: true, automationEnabled: true - }); + }); vm.expectRevert(LibCommon.InvalidCongestionThreshold.selector); - - LibDiamondUtils.executeCut(LibUtils.VM_SIGNER, address(erc20Supra), initParams, deployment); + new Diamond(admin, facets, LibUtils.VM_SIGNER, address(erc20Supra), initParams); vm.stopPrank(); } /// @dev Test to ensure initialization fails if congestion exponent is 0. function testInitializeRevertsIfCongestionExponentZero() public { vm.startPrank(admin); - Deployment memory deployment = LibDiamondUtils.deploy(admin); + FacetsDeployment memory facets = LibDiamondUtils.deploy_facets(); InitParams memory initParams = InitParams({ taskDurationCapSecs: 3600 * 24 * 7, @@ -495,16 +488,15 @@ contract DiamondInitTest is BaseDiamondTest { }); vm.expectRevert(LibCommon.InvalidCongestionExponent.selector); - - LibDiamondUtils.executeCut(LibUtils.VM_SIGNER, address(erc20Supra), initParams, deployment); - vm.stopPrank(); + new Diamond(admin, facets, LibUtils.VM_SIGNER, address(erc20Supra), initParams); + vm.stopPrank(); } /// @dev Test to ensure initialization fails if task capacity is 0. function testInitializeRevertsIfTaskCapacityZero() public { vm.startPrank(admin); - Deployment memory deployment = LibDiamondUtils.deploy(admin); - + FacetsDeployment memory facets = LibDiamondUtils.deploy_facets(); + InitParams memory initParams = InitParams({ taskDurationCapSecs: 3600 * 24 * 7, registryMaxGasCap: 20_000_000, @@ -523,16 +515,14 @@ contract DiamondInitTest is BaseDiamondTest { }); vm.expectRevert(LibCommon.InvalidTaskCapacity.selector); - - LibDiamondUtils.executeCut(LibUtils.VM_SIGNER, address(erc20Supra), initParams, deployment); - vm.stopPrank(); + new Diamond(admin, facets, LibUtils.VM_SIGNER, address(erc20Supra), initParams); + vm.stopPrank(); } /// @dev Test to ensure initialization fails if cycle duration is 0. function testInitializeRevertsIfCycleDurationZero() public { vm.startPrank(admin); - Deployment memory deployment = LibDiamondUtils.deploy(admin); - + FacetsDeployment memory facets = LibDiamondUtils.deploy_facets(); InitParams memory initParams = InitParams({ taskDurationCapSecs: 3600 * 24 * 7, registryMaxGasCap: 20_000_000, @@ -551,16 +541,14 @@ contract DiamondInitTest is BaseDiamondTest { }); vm.expectRevert(LibCommon.InvalidCycleDuration.selector); - - LibDiamondUtils.executeCut(LibUtils.VM_SIGNER, address(erc20Supra), initParams, deployment); + new Diamond(admin, facets, LibUtils.VM_SIGNER, address(erc20Supra), initParams); vm.stopPrank(); } /// @dev Test to ensure initialization fails if system task duration is <= cycle duration. function testInitializeRevertsIfInvalidSysTaskDuration() public { vm.startPrank(admin); - Deployment memory deployment = LibDiamondUtils.deploy(admin); - + FacetsDeployment memory facets = LibDiamondUtils.deploy_facets(); InitParams memory initParams = InitParams({ taskDurationCapSecs: 3600 * 24 * 7, registryMaxGasCap: 20_000_000, @@ -579,16 +567,14 @@ contract DiamondInitTest is BaseDiamondTest { }); vm.expectRevert(LibCommon.InvalidSysTaskDuration.selector); - - LibDiamondUtils.executeCut(LibUtils.VM_SIGNER, address(erc20Supra), initParams, deployment); + new Diamond(admin, facets, LibUtils.VM_SIGNER, address(erc20Supra), initParams); vm.stopPrank(); } /// @dev Test to ensure initialization fails if system registry max gas cap is 0. function testInitializeRevertsIfSysRegistryMaxGasCapZero() public { vm.startPrank(admin); - Deployment memory deployment = LibDiamondUtils.deploy(admin); - + FacetsDeployment memory facets = LibDiamondUtils.deploy_facets(); InitParams memory initParams = InitParams({ taskDurationCapSecs: 3600 * 24 * 7, registryMaxGasCap: 20_000_000, @@ -607,16 +593,14 @@ contract DiamondInitTest is BaseDiamondTest { }); vm.expectRevert(LibCommon.InvalidSysRegistryMaxGasCap.selector); - - LibDiamondUtils.executeCut(LibUtils.VM_SIGNER, address(erc20Supra), initParams, deployment); + new Diamond(admin, facets, LibUtils.VM_SIGNER, address(erc20Supra), initParams); vm.stopPrank(); } /// @dev Test to ensure initialization fails if system task capacity is 0. function testInitializeRevertsIfSysTaskCapacityZero() public { vm.startPrank(admin); - Deployment memory deployment = LibDiamondUtils.deploy(admin); - + FacetsDeployment memory facets = LibDiamondUtils.deploy_facets(); InitParams memory initParams = InitParams({ taskDurationCapSecs: 3600 * 24 * 7, registryMaxGasCap: 20_000_000, @@ -635,8 +619,7 @@ contract DiamondInitTest is BaseDiamondTest { }); vm.expectRevert(LibCommon.InvalidSysTaskCapacity.selector); - - LibDiamondUtils.executeCut(LibUtils.VM_SIGNER, address(erc20Supra), initParams, deployment); + new Diamond(admin, facets, LibUtils.VM_SIGNER, address(erc20Supra), initParams); vm.stopPrank(); } } From 4aeed017e1bd7182af2d7a32e5b1a44e18d521d2 Mon Sep 17 00:00:00 2001 From: Aregnaz Harutyunyan <> Date: Mon, 20 Apr 2026 22:21:44 +0400 Subject: [PATCH 3/4] Updated genesis transaction to facilitate move gov-proposal generation --- Cargo.lock | 68 +++++++++++-------- Cargo.toml | 1 + crates/supra-extension/Cargo.toml | 1 + .../supra-extension/src/contracts/configs.rs | 2 + .../src/contracts/generator.rs | 14 ++-- .../src/contracts/transaction.rs | 33 +++++---- 6 files changed, 70 insertions(+), 49 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5aa06e95e5..0d929a30ef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1775,71 +1775,70 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.11" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" dependencies = [ - "darling_core 0.20.11", - "darling_macro 0.20.11", + "darling_core 0.21.3", + "darling_macro 0.21.3", ] [[package]] name = "darling" -version = "0.21.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d" dependencies = [ - "darling_core 0.21.3", - "darling_macro 0.21.3", + "darling_core 0.23.0", + "darling_macro 0.23.0", ] [[package]] name = "darling_core" -version = "0.20.11" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", + "serde", "strsim", "syn 2.0.103", ] [[package]] name = "darling_core" -version = "0.21.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" +checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0" dependencies = [ - "fnv", "ident_case", "proc-macro2", "quote", - "serde", "strsim", "syn 2.0.103", ] [[package]] name = "darling_macro" -version = "0.20.11" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ - "darling_core 0.20.11", + "darling_core 0.21.3", "quote", "syn 2.0.103", ] [[package]] name = "darling_macro" -version = "0.21.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" +checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" dependencies = [ - "darling_core 0.21.3", + "darling_core 0.23.0", "quote", "syn 2.0.103", ] @@ -5007,6 +5006,7 @@ dependencies = [ "revm-primitives 20.2.1", "serde", "serde_json", + "serde_with", "thiserror 2.0.17", "toml 0.9.11+spec-1.1.0", ] @@ -5316,6 +5316,18 @@ dependencies = [ "serde_json", ] +[[package]] +name = "schemars" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + [[package]] name = "scoped-tls" version = "1.0.1" @@ -5541,18 +5553,18 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.13.0" +version = "3.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf65a400f8f66fb7b0552869ad70157166676db75ed8181f8104ea91cf9d0b42" +checksum = "dd5414fad8e6907dbdd5bc441a50ae8d6e26151a03b1de04d89a5576de61d01f" dependencies = [ "base64", "chrono", "hex", "indexmap 1.9.3", "indexmap 2.12.1", - "schemars", - "serde", - "serde_derive", + "schemars 0.9.0", + "schemars 1.2.1", + "serde_core", "serde_json", "serde_with_macros", "time", @@ -5560,11 +5572,11 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.13.0" +version = "3.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81679d9ed988d5e9a5e6531dc3f2c28efbd639cbd1dfb628df08edea6004da77" +checksum = "d3db8978e608f1fe7357e211969fd9abdcae80bac1ba7a3369bb7eb6b404eb65" dependencies = [ - "darling 0.20.11", + "darling 0.23.0", "proc-macro2", "quote", "syn 2.0.103", diff --git a/Cargo.toml b/Cargo.toml index d60a06241d..b7f84befb6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -121,6 +121,7 @@ criterion = { package = "codspeed-criterion-compat", version = "2.10" } # serde serde = { version = "1.0", default-features = false } serde_json = { version = "1.0.149", default-features = false } +serde_with = "3.18.0" # misc auto_impl = "1.3.0" diff --git a/crates/supra-extension/Cargo.toml b/crates/supra-extension/Cargo.toml index 05659954a3..66b3a9a806 100644 --- a/crates/supra-extension/Cargo.toml +++ b/crates/supra-extension/Cargo.toml @@ -29,6 +29,7 @@ foundry-compilers = { workspace = true } serde_json = { workspace = true } bincode = { workspace = true , features = ["serde"]} once_cell = { workspace = true } +serde_with = { workspace = true , features = ["hex"]} [lints] workspace = true diff --git a/crates/supra-extension/src/contracts/configs.rs b/crates/supra-extension/src/contracts/configs.rs index 04a3099d69..5b3b2068ef 100644 --- a/crates/supra-extension/src/contracts/configs.rs +++ b/crates/supra-extension/src/contracts/configs.rs @@ -143,10 +143,12 @@ pub struct GenesisTransactionGeneratorConfig { pub foundation_threshold: u64, /// Flag indicating whether full set of genesis transaction should be generated or only mandatory once. pub full_set: bool, + #[serde(skip_serializing_if = "Option::is_none")] /// Automation configuration parameters (optional, uses defaults if None). pub automation_config: Option, /// Initial native tokens to be minted to ERC20Supra handler contract pub initial_native_token: u128, + #[serde(skip_serializing_if = "Option::is_none")] /// Indicates whether the genesis transactions are generated for localnet. pub supra_nova_config: Option, } diff --git a/crates/supra-extension/src/contracts/generator.rs b/crates/supra-extension/src/contracts/generator.rs index bfe043c250..1b5faaced6 100644 --- a/crates/supra-extension/src/contracts/generator.rs +++ b/crates/supra-extension/src/contracts/generator.rs @@ -164,11 +164,11 @@ impl GenesisTransactionGenerator { fn generate_create2_factory_transaction() -> GenesisTransaction { GenesisTransaction::new( CREATE2_FACTORY_OWNER, - TxKind::Create, - CREATE2_FACTORY_CODE.to_owned(), 0, - CREATE2_FACTORY_ADDRESS, 0, + CREATE2_FACTORY_CODE.to_owned(), + TxKind::Create, + CREATE2_FACTORY_ADDRESS, ) } @@ -480,11 +480,11 @@ impl GenesisTransactionGenerator { let proxy_txn_data = [proxy_impl_data, proxy_args].concat(); let erc20supra_handler = GenesisTransaction::new( self.address, - TxKind::Create, - proxy_txn_data, self.nonce, - erc20_handler_address, initial_native_tokens, + proxy_txn_data, + TxKind::Create, + erc20_handler_address, ); self.nonce += 1; @@ -714,7 +714,7 @@ impl GenesisTransactionGenerator { sysRegistryMaxGasCap: config.sys_registry_max_gas_cap, sysTaskCapacity: config.sys_task_capacity, registrationEnabled: true, - automationEnabled: true, + automationEnabled: config.enable_automation_feature, }; let diamond_constructor_data = Diamond::constructorCall { diff --git a/crates/supra-extension/src/contracts/transaction.rs b/crates/supra-extension/src/contracts/transaction.rs index e0995332ae..e23ceef690 100644 --- a/crates/supra-extension/src/contracts/transaction.rs +++ b/crates/supra-extension/src/contracts/transaction.rs @@ -4,6 +4,9 @@ use derive_getters::{Dissolve, Getters}; use derive_more::Constructor; use primitives::{keccak256, Address, TxKind, address, hex}; use std::fmt::{Debug, Display}; +use serde::{Serialize, Deserialize}; +use serde_with::hex::Hex ; +use serde_with::serde_as; /// The address that deploys the default CREATE2 deployer contract. @@ -21,20 +24,22 @@ pub const CREATE2_FACTORY_CODE: &[u8] = &hex!( ); /// Represents data required to construct genesis contracts deployment transaction -#[derive(Clone, Getters, Dissolve, Constructor)] +#[serde_as] +#[derive(Clone, Getters, Dissolve, Constructor, Serialize, Deserialize)] pub struct GenesisTransaction { /// Sender of the transaction sender: Address, - /// Kind of the transaction. - kind: TxKind, - /// Input data of the transaction. - data: Vec, /// Expected nonce of the sender account. nonce: u64, - /// Pre-computed deploy address of the contract if the transaction deploys a contract. - deploy_address: Address, /// Amount to mint to the contract address if the transaction deploys a contract. value: u128, + /// Input data of the transaction. + #[serde_as(as = "Hex")] + data: Vec, + /// Kind of the transaction. + kind: TxKind, + /// Pre-computed deploy address of the contract if the transaction deploys a contract. + deploy_address: Address, } impl GenesisTransaction { @@ -47,11 +52,11 @@ impl GenesisTransaction { ) -> Self { Self::new ( sender, - TxKind::Create, - data, nonce, - deploy_address, 0, + data, + TxKind::Create, + deploy_address, ) } @@ -67,11 +72,11 @@ impl GenesisTransaction { let call_data = [ salt_hash.to_vec(), data].concat(); Self::new ( sender, - TxKind::Call(CREATE2_FACTORY_ADDRESS), - call_data, nonce, - deploy_address, 0, + call_data, + TxKind::Call(CREATE2_FACTORY_ADDRESS), + deploy_address, ) } @@ -91,7 +96,7 @@ impl Debug for GenesisTransaction { } /// Genesis transaction tags which also guide deployment/execution order -#[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord)] +#[derive(Debug, Hash, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)] #[allow(missing_docs)] #[repr(u8)] pub enum GenesisTransactionTags { From 51a46fc7e98f2e0143b05736f0a1faf579cd200e Mon Sep 17 00:00:00 2001 From: Aregnaz Harutyunyan <> Date: Tue, 21 Apr 2026 20:17:26 +0400 Subject: [PATCH 4/4] Fixed compile errors after rebase --- solidity/supra_contracts/src/Diamond.sol | 19 +------------------ .../supra_contracts/src/facets/CoreFacet.sol | 14 +------------- .../src/libraries/LibCommon.sol | 10 ---------- 3 files changed, 2 insertions(+), 41 deletions(-) diff --git a/solidity/supra_contracts/src/Diamond.sol b/solidity/supra_contracts/src/Diamond.sol index 26334974b2..97e0302822 100644 --- a/solidity/supra_contracts/src/Diamond.sol +++ b/solidity/supra_contracts/src/Diamond.sol @@ -80,24 +80,7 @@ contract Diamond { // ------------------------------------------------------------------ bytes memory initCalldata = abi.encodeCall( DiamondInit.init, - ( - _params.taskDurationCapSecs, - _params.registryMaxGasCap, - _params.automationBaseFeeWeiPerSec, - _params.flatRegistrationFeeWei, - _params.congestionThresholdPercentage, - _params.congestionBaseFeeWeiPerSec, - _params.congestionExponent, - _params.taskCapacity, - _params.cycleDurationSecs, - _params.sysTaskDurationCapSecs, - _params.sysRegistryMaxGasCap, - _params.sysTaskCapacity, - _vmSigner, - _erc20Supra, - _params.automationEnabled, - _params.registrationEnabled - ) + (_params, _vmSigner, _erc20Supra) ); LibDiamond.diamondCut(cut, _d.diamondInit, initCalldata); diff --git a/solidity/supra_contracts/src/facets/CoreFacet.sol b/solidity/supra_contracts/src/facets/CoreFacet.sol index 99b76a29a9..861964c922 100644 --- a/solidity/supra_contracts/src/facets/CoreFacet.sol +++ b/solidity/supra_contracts/src/facets/CoreFacet.sol @@ -84,19 +84,7 @@ contract CoreFacet is ICoreFacet, IFacetSelectors { return (s.index, s.startTime, s.durationSecs, s.cycleState); } - /// @notice Returns the index, start time, duration, state, transition details if any of the current cycle. - function getCycleStateDetails() external view returns (LibCommon.CycleDetails memory details) { - TransitionState storage transitionState = LibAppStorage.transitionState(); - - details.index = s.index; - details.startTime = s.startTime; - details.durationSecs = s.durationSecs; - details.state = s.cycleState; - details.nextTaskIndexPosition = transitionState.nextTaskIndexPosition; - details.expectedTasksToBeProcessed = transitionState.expectedTasksToBeProcessed.values(); - } - - /// @notice Returns the duration of the current cycle. + /// @notice Returns the duration of the current cycle. function getCycleDuration() external view returns (uint64) { return s.durationSecs; } diff --git a/solidity/supra_contracts/src/libraries/LibCommon.sol b/solidity/supra_contracts/src/libraries/LibCommon.sol index 1a5cb49565..cdc161f828 100644 --- a/solidity/supra_contracts/src/libraries/LibCommon.sol +++ b/solidity/supra_contracts/src/libraries/LibCommon.sol @@ -37,16 +37,6 @@ library LibCommon { GST } - /// @notice Struct to hold cycle details. - struct CycleDetails { - uint64 index; - uint64 startTime; - uint64 durationSecs; - CycleState state; - uint64 nextTaskIndexPosition; - uint256[] expectedTasksToBeProcessed; - } - /// @notice Represents intermediate state of the registry on cycle change. struct IntermediateStateOfCycleChange { uint256 cycleLockedFees;