From 6254f0a612e04d2ea4811be211c6d84065e78941 Mon Sep 17 00:00:00 2001 From: Steve Nguyen Date: Thu, 8 Aug 2024 11:29:43 +0000 Subject: [PATCH] fix: dependencies --- Cargo.lock | 1076 +++++++++-------- Cargo.toml | 54 +- crates/orchestrator/src/jobs/da_job/mod.rs | 90 +- .../gps-fact-checker/src/fact_info.rs | 6 +- .../starknet/src/conversion.rs | 8 +- crates/settlement-clients/starknet/src/lib.rs | 66 +- 6 files changed, 672 insertions(+), 628 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae5316d1..8d0ef09a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,7 +11,7 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] name = "abstract-domain-derive" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "proc-macro2", "quote", @@ -144,28 +144,27 @@ dependencies = [ [[package]] name = "alloy" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9134b68e24175eff6c3c4d2bffeefb0a1b7435462130862c88d1524ca376e7e5" +checksum = "3f4a4aaae80afd4be443a6aecd92a6b255dcdd000f97996928efb33d8a71e100" dependencies = [ - "alloy-consensus 0.1.2", + "alloy-consensus 0.2.1", "alloy-contract", - "alloy-core 0.7.6", - "alloy-eips 0.1.2", + "alloy-core 0.7.7", + "alloy-eips 0.2.1", "alloy-genesis", - "alloy-network 0.1.2", - "alloy-provider 0.1.2", + "alloy-network 0.2.1", + "alloy-provider 0.2.1", "alloy-pubsub", - "alloy-rpc-client 0.1.2", - "alloy-rpc-types 0.1.2", - "alloy-serde 0.1.2", - "alloy-signer 0.1.2", + "alloy-rpc-client 0.2.1", + "alloy-rpc-types 0.2.1", + "alloy-serde 0.2.1", + "alloy-signer 0.2.1", "alloy-signer-local", - "alloy-transport 0.1.2", - "alloy-transport-http 0.1.2", + "alloy-transport 0.2.1", + "alloy-transport-http 0.2.1", "alloy-transport-ipc", "alloy-transport-ws", - "reqwest 0.12.5", ] [[package]] @@ -191,33 +190,34 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a016bfa21193744d4c38b3f3ab845462284d129e5e23c7cc0fafca7e92d9db37" +checksum = "04c309895995eaa4bfcc345f5515a39c7df9447798645cc8bf462b6c5bf1dc96" dependencies = [ - "alloy-eips 0.1.2", - "alloy-primitives 0.7.6", + "alloy-eips 0.2.1", + "alloy-primitives 0.7.7", "alloy-rlp", - "alloy-serde 0.1.2", + "alloy-serde 0.2.1", "c-kzg", "serde", ] [[package]] name = "alloy-contract" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47b2a620fd588d463ccf0f5931b41357664b293a8d31592768845a2a101bb9e" +checksum = "3f4e0ef72b0876ae3068b2ed7dfae9ae1779ce13cfaec2ee1f08f5bd0348dc57" dependencies = [ - "alloy-dyn-abi 0.7.6", - "alloy-json-abi 0.7.6", - "alloy-network 0.1.2", - "alloy-primitives 0.7.6", - "alloy-provider 0.1.2", + "alloy-dyn-abi 0.7.7", + "alloy-json-abi 0.7.7", + "alloy-network 0.2.1", + "alloy-network-primitives", + "alloy-primitives 0.7.7", + "alloy-provider 0.2.1", "alloy-pubsub", "alloy-rpc-types-eth", - "alloy-sol-types 0.7.6", - "alloy-transport 0.1.2", + "alloy-sol-types 0.7.7", + "alloy-transport 0.2.1", "futures", "futures-util", "thiserror", @@ -237,14 +237,14 @@ dependencies = [ [[package]] name = "alloy-core" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5af3faff14c12c8b11037e0a093dd157c3702becb8435577a2408534d0758315" +checksum = "529fc6310dc1126c8de51c376cbc59c79c7f662bd742be7dc67055d5421a81b4" dependencies = [ - "alloy-dyn-abi 0.7.6", - "alloy-json-abi 0.7.6", - "alloy-primitives 0.7.6", - "alloy-sol-types 0.7.6", + "alloy-dyn-abi 0.7.7", + "alloy-json-abi 0.7.7", + "alloy-primitives 0.7.7", + "alloy-sol-types 0.7.7", ] [[package]] @@ -266,14 +266,14 @@ dependencies = [ [[package]] name = "alloy-dyn-abi" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6e6436a9530f25010d13653e206fab4c9feddacf21a54de8d7311b275bc56b" +checksum = "413902aa18a97569e60f679c23f46a18db1656d87ab4d4e49d0e1e52042f66df" dependencies = [ - "alloy-json-abi 0.7.6", - "alloy-primitives 0.7.6", - "alloy-sol-type-parser 0.7.6", - "alloy-sol-types 0.7.6", + "alloy-json-abi 0.7.7", + "alloy-primitives 0.7.7", + "alloy-sol-type-parser 0.7.7", + "alloy-sol-types 0.7.7", "const-hex", "itoa", "serde", @@ -296,15 +296,16 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d6d8118b83b0489cfb7e6435106948add2b35217f4a5004ef895f613f60299" +checksum = "d9431c99a3b3fe606ede4b3d4043bdfbcb780c45b8d8d226c3804e2b75cfbe68" dependencies = [ - "alloy-primitives 0.7.6", + "alloy-primitives 0.7.7", "alloy-rlp", - "alloy-serde 0.1.2", + "alloy-serde 0.2.1", "c-kzg", "derive_more", + "k256", "once_cell", "serde", "sha2 0.10.8", @@ -312,12 +313,12 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "894f33a7822abb018db56b10ab90398e63273ce1b5a33282afd186c132d764a6" +checksum = "79614dfe86144328da11098edcc7bc1a3f25ad8d3134a9eb9e857e06f0d9840d" dependencies = [ - "alloy-primitives 0.7.6", - "alloy-serde 0.1.2", + "alloy-primitives 0.7.7", + "alloy-serde 0.2.1", "serde", ] @@ -335,12 +336,12 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeaccd50238126e3a0ff9387c7c568837726ad4f4e399b528ca88104d6c25ef" +checksum = "bc05b04ac331a9f07e3a4036ef7926e49a8bf84a99a1ccfc7e2ab55a5fcbb372" dependencies = [ - "alloy-primitives 0.7.6", - "alloy-sol-type-parser 0.7.6", + "alloy-primitives 0.7.7", + "alloy-sol-type-parser 0.7.7", "serde", "serde_json", ] @@ -358,11 +359,12 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61f0ae6e93b885cc70fe8dae449e7fd629751dbee8f59767eaaa7285333c5727" +checksum = "57e2865c4c3bb4cdad3f0d9ec1ab5c0c657ba69a375651bd35e32fb6c180ccc2" dependencies = [ - "alloy-primitives 0.7.6", + "alloy-primitives 0.7.7", + "alloy-sol-types 0.7.7", "serde", "serde_json", "thiserror", @@ -388,24 +390,36 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc122cbee2b8523854cc11d87bcd5773741602c553d2d2d106d82eeb9c16924a" +checksum = "6e701fc87ef9a3139154b0b4ccb935b565d27ffd9de020fe541bf2dec5ae4ede" dependencies = [ - "alloy-consensus 0.1.2", - "alloy-eips 0.1.2", - "alloy-json-rpc 0.1.2", - "alloy-primitives 0.7.6", + "alloy-consensus 0.2.1", + "alloy-eips 0.2.1", + "alloy-json-rpc 0.2.1", + "alloy-network-primitives", + "alloy-primitives 0.7.7", "alloy-rpc-types-eth", - "alloy-serde 0.1.2", - "alloy-signer 0.1.2", - "alloy-sol-types 0.7.6", + "alloy-serde 0.2.1", + "alloy-signer 0.2.1", + "alloy-sol-types 0.7.7", "async-trait", "auto_impl", "futures-utils-wasm", "thiserror", ] +[[package]] +name = "alloy-network-primitives" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec9d5a0f9170b10988b6774498a022845e13eda94318440d17709d50687f67f9" +dependencies = [ + "alloy-primitives 0.7.7", + "alloy-serde 0.2.1", + "serde", +] + [[package]] name = "alloy-primitives" version = "0.6.4" @@ -430,9 +444,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f783611babedbbe90db3478c120fb5f5daacceffc210b39adc0af4fe0da70bad" +checksum = "ccb3ead547f4532bc8af961649942f0b9c16ee9226e26caa3f38420651cc0bf4" dependencies = [ "alloy-rlp", "bytes", @@ -477,21 +491,22 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d5af289798fe8783acd0c5f10644d9d26f54a12bc52a083e4f3b31718e9bf92" +checksum = "3f9c0ab10b93de601a6396fc7ff2ea10d3b28c46f079338fa562107ebf9857c8" dependencies = [ "alloy-chains", - "alloy-consensus 0.1.2", - "alloy-eips 0.1.2", - "alloy-json-rpc 0.1.2", - "alloy-network 0.1.2", - "alloy-primitives 0.7.6", + "alloy-consensus 0.2.1", + "alloy-eips 0.2.1", + "alloy-json-rpc 0.2.1", + "alloy-network 0.2.1", + "alloy-network-primitives", + "alloy-primitives 0.7.7", "alloy-pubsub", - "alloy-rpc-client 0.1.2", + "alloy-rpc-client 0.2.1", "alloy-rpc-types-eth", - "alloy-transport 0.1.2", - "alloy-transport-http 0.1.2", + "alloy-transport 0.2.1", + "alloy-transport-http 0.2.1", "alloy-transport-ipc", "alloy-transport-ws", "async-stream", @@ -512,13 +527,13 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702f330b7da123a71465ab9d39616292f8344a2811c28f2cc8d8438a69d79e35" +checksum = "3f5da2c55cbaf229bad3c5f8b00b5ab66c74ef093e5f3a753d874cfecf7d2281" dependencies = [ - "alloy-json-rpc 0.1.2", - "alloy-primitives 0.7.6", - "alloy-transport 0.1.2", + "alloy-json-rpc 0.2.1", + "alloy-primitives 0.7.7", + "alloy-transport 0.2.1", "bimap", "futures", "serde", @@ -573,15 +588,15 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40fcb53b2a9d0a78a4968b2eca8805a4b7011b9ee3fdfa2acaf137c5128f36b" +checksum = "5b38e3ffdb285df5d9f60cb988d336d9b8e3505acb78750c3bc60336a7af41d3" dependencies = [ - "alloy-json-rpc 0.1.2", - "alloy-primitives 0.7.6", + "alloy-json-rpc 0.2.1", + "alloy-primitives 0.7.7", "alloy-pubsub", - "alloy-transport 0.1.2", - "alloy-transport-http 0.1.2", + "alloy-transport 0.2.1", + "alloy-transport-http 0.2.1", "alloy-transport-ipc", "alloy-transport-ws", "futures", @@ -626,27 +641,28 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f2fbe956a3e0f0975c798f488dc6be96b669544df3737e18f4a325b42f4c86" +checksum = "e6c31a3750b8f5a350d17354e46a52b0f2f19ec5f2006d816935af599dedc521" dependencies = [ "alloy-rpc-types-engine", "alloy-rpc-types-eth", - "alloy-serde 0.1.2", + "alloy-serde 0.2.1", + "serde", ] [[package]] name = "alloy-rpc-types-engine" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd473d98ec552f8229cd6d566bd2b0bbfc5bb4efcefbb5288c834aa8fd832020" +checksum = "ff63f51b2fb2f547df5218527fd0653afb1947bf7fead5b3ce58c75d170b30f7" dependencies = [ - "alloy-consensus 0.1.2", - "alloy-eips 0.1.2", - "alloy-primitives 0.7.6", + "alloy-consensus 0.2.1", + "alloy-eips 0.2.1", + "alloy-primitives 0.7.7", "alloy-rlp", "alloy-rpc-types-eth", - "alloy-serde 0.1.2", + "alloy-serde 0.2.1", "jsonwebtoken 9.3.0", "rand 0.8.5", "serde", @@ -655,16 +671,17 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083f443a83b9313373817236a8f4bea09cca862618e9177d822aee579640a5d6" +checksum = "81e18424d962d7700a882fe423714bd5b9dde74c7a7589d4255ea64068773aef" dependencies = [ - "alloy-consensus 0.1.2", - "alloy-eips 0.1.2", - "alloy-primitives 0.7.6", + "alloy-consensus 0.2.1", + "alloy-eips 0.2.1", + "alloy-network-primitives", + "alloy-primitives 0.7.7", "alloy-rlp", - "alloy-serde 0.1.2", - "alloy-sol-types 0.7.6", + "alloy-serde 0.2.1", + "alloy-sol-types 0.7.7", "itertools 0.13.0", "serde", "serde_json", @@ -683,11 +700,11 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d94da1c0c4e27cc344b05626fe22a89dc6b8b531b9475f3b7691dbf6913e4109" +checksum = "e33feda6a53e6079895aed1d08dcb98a1377b000d80d16370fbbdb8155d547ef" dependencies = [ - "alloy-primitives 0.7.6", + "alloy-primitives 0.7.7", "serde", "serde_json", ] @@ -707,11 +724,11 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58d876be3afd8b78979540084ff63995292a26aa527ad0d44276405780aa0ffd" +checksum = "740a25b92e849ed7b0fa013951fe2f64be9af1ad5abe805037b44fb7770c5c47" dependencies = [ - "alloy-primitives 0.7.6", + "alloy-primitives 0.7.7", "async-trait", "auto_impl", "elliptic-curve 0.13.8", @@ -721,14 +738,14 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40a37dc216c269b8a7244047cb1c18a9c69f7a0332ab2c4c2aa4cbb1a31468b" +checksum = "1b0707d4f63e4356a110b30ef3add8732ab6d181dd7be4607bf79b8777105cee" dependencies = [ - "alloy-consensus 0.1.2", - "alloy-network 0.1.2", - "alloy-primitives 0.7.6", - "alloy-signer 0.1.2", + "alloy-consensus 0.2.1", + "alloy-network 0.2.1", + "alloy-primitives 0.7.7", + "alloy-signer 0.2.1", "async-trait", "k256", "rand 0.8.5", @@ -770,9 +787,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bad41a7c19498e3f6079f7744656328699f8ea3e783bdd10d85788cd439f572" +checksum = "2b40397ddcdcc266f59f959770f601ce1280e699a91fc1862f29cef91707cd09" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", @@ -784,11 +801,11 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9899da7d011b4fe4c406a524ed3e3f963797dbc93b45479d60341d3a27b252" +checksum = "867a5469d61480fea08c7333ffeca52d5b621f5ca2e44f271b117ec1fc9a0525" dependencies = [ - "alloy-json-abi 0.7.6", + "alloy-json-abi 0.7.7", "alloy-sol-macro-input", "const-hex", "heck 0.5.0", @@ -797,17 +814,17 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.66", - "syn-solidity 0.7.6", + "syn-solidity 0.7.7", "tiny-keccak", ] [[package]] name = "alloy-sol-macro-input" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32d595768fdc61331a132b6f65db41afae41b9b97d36c21eb1b955c422a7e60" +checksum = "2e482dc33a32b6fadbc0f599adea520bd3aaa585c141a80b404d0a3e3fa72528" dependencies = [ - "alloy-json-abi 0.7.6", + "alloy-json-abi 0.7.7", "const-hex", "dunce", "heck 0.5.0", @@ -815,7 +832,7 @@ dependencies = [ "quote", "serde_json", "syn 2.0.66", - "syn-solidity 0.7.6", + "syn-solidity 0.7.7", ] [[package]] @@ -829,10 +846,11 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa2fbd22d353d8685bd9fee11ba2d8b5c3b1d11e56adb3265fcf1f32bfdf404" +checksum = "cbcba3ca07cf7975f15d871b721fb18031eec8bce51103907f6dcce00b255d98" dependencies = [ + "serde", "winnow 0.6.13", ] @@ -850,13 +868,13 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a49042c6d3b66a9fe6b2b5a8bf0d39fc2ae1ee0310a2a26ffedd79fb097878dd" +checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7" dependencies = [ - "alloy-json-abi 0.7.6", - "alloy-primitives 0.7.6", - "alloy-sol-macro 0.7.6", + "alloy-json-abi 0.7.7", + "alloy-primitives 0.7.7", + "alloy-sol-macro 0.7.7", "const-hex", "serde", ] @@ -881,11 +899,11 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245af9541f0a0dbd5258669c80dfe3af118164cacec978a520041fc130550deb" +checksum = "3d0590afbdacf2f8cca49d025a2466f3b6584a016a8b28f532f29f8da1007bae" dependencies = [ - "alloy-json-rpc 0.1.2", + "alloy-json-rpc 0.2.1", "base64 0.22.1", "futures-util", "futures-utils-wasm", @@ -894,6 +912,7 @@ dependencies = [ "thiserror", "tokio", "tower", + "tracing", "url", ] @@ -912,12 +931,12 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5619c017e1fdaa1db87f9182f4f0ed97c53d674957f4902fba655e972d359c6c" +checksum = "2437d145d80ea1aecde8574d2058cceb8b3c9cba05f6aea8e67907c660d46698" dependencies = [ - "alloy-json-rpc 0.1.2", - "alloy-transport 0.1.2", + "alloy-json-rpc 0.2.1", + "alloy-transport 0.2.1", "reqwest 0.12.5", "serde_json", "tower", @@ -927,13 +946,13 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "173cefa110afac7a53cf2e75519327761f2344d305eea2993f3af1b2c1fc1c44" +checksum = "804494366e20468776db4e18f9eb5db7db0fe14f1271eb6dbf155d867233405c" dependencies = [ - "alloy-json-rpc 0.1.2", + "alloy-json-rpc 0.2.1", "alloy-pubsub", - "alloy-transport 0.1.2", + "alloy-transport 0.2.1", "bytes", "futures", "interprocess", @@ -946,12 +965,12 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c0aff8af5be5e58856c5cdd1e46db2c67c7ecd3a652d9100b4822c96c899947" +checksum = "af855163e7df008799941aa6dd324a43ef2bf264b08ba4b22d44aad6ced65300" dependencies = [ "alloy-pubsub", - "alloy-transport 0.1.2", + "alloy-transport 0.2.1", "futures", "http 1.1.0", "rustls 0.23.10", @@ -1092,7 +1111,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "aptos-aggregator" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-logger", "aptos-types", @@ -1106,7 +1125,7 @@ dependencies = [ [[package]] name = "aptos-api-types" version = "0.0.1" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-config", @@ -1136,7 +1155,7 @@ dependencies = [ [[package]] name = "aptos-bitvec" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "serde", "serde_bytes", @@ -1145,7 +1164,7 @@ dependencies = [ [[package]] name = "aptos-block-executor" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-aggregator", @@ -1180,7 +1199,7 @@ dependencies = [ [[package]] name = "aptos-block-partitioner" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-crypto", "aptos-logger", @@ -1189,19 +1208,19 @@ dependencies = [ "bcs 0.1.4", "clap 4.5.9", "dashmap", - "itertools 0.12.1", + "itertools 0.13.0", + "jemallocator", "move-core-types", "once_cell", "rand 0.7.3", "rayon", "serde", - "tikv-jemallocator", ] [[package]] name = "aptos-cached-packages" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-framework", @@ -1215,7 +1234,7 @@ dependencies = [ [[package]] name = "aptos-config" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-crypto", @@ -1232,7 +1251,6 @@ dependencies = [ "get_if_addrs", "maplit", "num_cpus", - "number_range", "poem-openapi", "rand 0.7.3", "serde", @@ -1246,7 +1264,7 @@ dependencies = [ [[package]] name = "aptos-crypto" version = "0.0.3" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aes-gcm", "anyhow", @@ -1297,7 +1315,7 @@ dependencies = [ [[package]] name = "aptos-crypto-derive" version = "0.0.3" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "proc-macro2", "quote", @@ -1307,7 +1325,7 @@ dependencies = [ [[package]] name = "aptos-dkg" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-crypto", @@ -1339,7 +1357,7 @@ dependencies = [ [[package]] name = "aptos-drop-helper" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-infallible", "aptos-metrics-core", @@ -1350,7 +1368,7 @@ dependencies = [ [[package]] name = "aptos-experimental-runtimes" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-runtimes", "core_affinity", @@ -1363,7 +1381,7 @@ dependencies = [ [[package]] name = "aptos-framework" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-aggregator", @@ -1392,7 +1410,7 @@ dependencies = [ "either", "flate2", "hex", - "itertools 0.12.1", + "itertools 0.13.0", "libsecp256k1", "log", "lru 0.7.8", @@ -1431,7 +1449,7 @@ dependencies = [ [[package]] name = "aptos-gas-algebra" version = "0.0.1" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "either", "move-core-types", @@ -1440,7 +1458,7 @@ dependencies = [ [[package]] name = "aptos-gas-meter" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-gas-algebra", "aptos-gas-schedule", @@ -1455,7 +1473,7 @@ dependencies = [ [[package]] name = "aptos-gas-schedule" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-gas-algebra", "aptos-global-constants", @@ -1468,17 +1486,17 @@ dependencies = [ [[package]] name = "aptos-global-constants" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" [[package]] name = "aptos-infallible" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" [[package]] name = "aptos-ledger" version = "0.2.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-crypto", "aptos-types", @@ -1491,7 +1509,7 @@ dependencies = [ [[package]] name = "aptos-log-derive" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "proc-macro2", "quote", @@ -1501,7 +1519,7 @@ dependencies = [ [[package]] name = "aptos-logger" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-infallible", "aptos-log-derive", @@ -1525,7 +1543,7 @@ dependencies = [ [[package]] name = "aptos-memory-usage-tracker" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-gas-algebra", "aptos-gas-meter", @@ -1538,7 +1556,7 @@ dependencies = [ [[package]] name = "aptos-metrics-core" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "prometheus", @@ -1547,7 +1565,7 @@ dependencies = [ [[package]] name = "aptos-move-stdlib" version = "0.1.1" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-gas-schedule", "aptos-native-interface", @@ -1562,7 +1580,7 @@ dependencies = [ [[package]] name = "aptos-mvhashmap" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-aggregator", @@ -1583,7 +1601,7 @@ dependencies = [ [[package]] name = "aptos-native-interface" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-gas-algebra", "aptos-gas-schedule", @@ -1600,7 +1618,7 @@ dependencies = [ [[package]] name = "aptos-node-identity" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-types", @@ -1611,9 +1629,8 @@ dependencies = [ [[package]] name = "aptos-openapi" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ - "async-trait", "percent-encoding", "poem", "poem-openapi", @@ -1624,11 +1641,11 @@ dependencies = [ [[package]] name = "aptos-package-builder" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-framework", - "itertools 0.12.1", + "itertools 0.13.0", "move-command-line-common", "move-package", "tempfile", @@ -1636,8 +1653,8 @@ dependencies = [ [[package]] name = "aptos-protos" -version = "1.3.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +version = "1.3.1" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "futures-core", "pbjson", @@ -1649,7 +1666,7 @@ dependencies = [ [[package]] name = "aptos-resource-viewer" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-types", @@ -1663,7 +1680,7 @@ dependencies = [ [[package]] name = "aptos-rest-client" version = "0.0.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-api-types", @@ -1686,7 +1703,7 @@ dependencies = [ [[package]] name = "aptos-runtimes" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "rayon", "tokio", @@ -1695,7 +1712,7 @@ dependencies = [ [[package]] name = "aptos-scratchpad" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-crypto", "aptos-drop-helper", @@ -1704,7 +1721,7 @@ dependencies = [ "aptos-metrics-core", "aptos-types", "bitvec 1.0.1", - "itertools 0.12.1", + "itertools 0.13.0", "once_cell", "rayon", "thiserror", @@ -1713,7 +1730,7 @@ dependencies = [ [[package]] name = "aptos-sdk" version = "0.0.3" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-cached-packages", @@ -1725,6 +1742,7 @@ dependencies = [ "base64 0.13.1", "bcs 0.1.4", "ed25519-dalek-bip32", + "hex", "move-core-types", "rand_core 0.5.1", "serde_json", @@ -1734,7 +1752,7 @@ dependencies = [ [[package]] name = "aptos-sdk-builder" version = "0.2.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-types", @@ -1752,7 +1770,7 @@ dependencies = [ [[package]] name = "aptos-secure-net" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-logger", "aptos-metrics-core", @@ -1770,7 +1788,7 @@ dependencies = [ [[package]] name = "aptos-secure-storage" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-crypto", "aptos-infallible", @@ -1798,7 +1816,7 @@ dependencies = [ "color-eyre", "dotenvy", "hex", - "mockall", + "mockall 0.13.0", "once_cell", "settlement-client-interface", "tokio", @@ -1809,7 +1827,7 @@ dependencies = [ [[package]] name = "aptos-short-hex-str" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "mirai-annotations", "serde", @@ -1820,7 +1838,7 @@ dependencies = [ [[package]] name = "aptos-speculative-state-helper" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-infallible", @@ -1831,7 +1849,7 @@ dependencies = [ [[package]] name = "aptos-storage-interface" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-crypto", @@ -1858,7 +1876,7 @@ dependencies = [ [[package]] name = "aptos-table-natives" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-gas-schedule", "aptos-native-interface", @@ -1876,7 +1894,7 @@ dependencies = [ [[package]] name = "aptos-temppath" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "hex", "rand 0.7.3", @@ -1885,7 +1903,7 @@ dependencies = [ [[package]] name = "aptos-time-service" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-infallible", "enum_dispatch", @@ -1898,7 +1916,7 @@ dependencies = [ [[package]] name = "aptos-types" version = "0.0.3" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-bitvec", @@ -1919,7 +1937,7 @@ dependencies = [ "fxhash", "hashbrown 0.14.5", "hex", - "itertools 0.12.1", + "itertools 0.13.0", "jsonwebtoken 8.3.0", "move-binary-format", "move-bytecode-verifier", @@ -1932,6 +1950,8 @@ dependencies = [ "num-traits 0.2.19", "once_cell", "passkey-types", + "poem-openapi", + "poem-openapi-derive", "quick_cache", "rand 0.7.3", "rayon", @@ -1951,12 +1971,12 @@ dependencies = [ [[package]] name = "aptos-utils" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" [[package]] name = "aptos-vault-client" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-crypto", "base64 0.13.1", @@ -1972,7 +1992,7 @@ dependencies = [ [[package]] name = "aptos-vm" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-aggregator", @@ -2022,7 +2042,7 @@ dependencies = [ [[package]] name = "aptos-vm-logging" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "aptos-crypto", "aptos-logger", @@ -2037,7 +2057,7 @@ dependencies = [ [[package]] name = "aptos-vm-types" version = "0.0.1" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "aptos-aggregator", @@ -2050,6 +2070,7 @@ dependencies = [ "either", "move-binary-format", "move-core-types", + "move-vm-runtime", "move-vm-types", "rand 0.7.3", "serde", @@ -3729,9 +3750,9 @@ dependencies = [ [[package]] name = "bollard" -version = "0.16.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aed08d3adb6ebe0eff737115056652670ae290f177759aac19c30456135f94c" +checksum = "4a063d51a634c7137ecd9f6390ec78e1c512e84c9ded80198ec7df3339a16a33" dependencies = [ "base64 0.22.1", "bollard-stubs", @@ -3744,12 +3765,12 @@ dependencies = [ "http-body-util", "hyper 1.3.1", "hyper-named-pipe", - "hyper-rustls 0.26.0", + "hyper-rustls 0.27.2", "hyper-util", - "hyperlocal-next", + "hyperlocal", "log", "pin-project-lite", - "rustls 0.22.4", + "rustls 0.23.10", "rustls-native-certs 0.7.0", "rustls-pemfile 2.1.2", "rustls-pki-types", @@ -3768,9 +3789,9 @@ dependencies = [ [[package]] name = "bollard-stubs" -version = "1.44.0-rc.2" +version = "1.45.0-rc.26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709d9aa1c37abb89d40f19f5d0ad6f0d88cb1581264e571c9350fc5bb89cf1c5" +checksum = "6d7c5415e3a6bc6d3e99eff6268e488fd4ee25e7b28c10f08fa6760bd9de16e4" dependencies = [ "serde", "serde_repr", @@ -4416,7 +4437,7 @@ dependencies = [ [[package]] name = "cairo-type-derive" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/snos?branch=od/os-output-serde#809b3b2ad74ebde7ec48bddc10317809f8098c90" +source = "git+https://github.com/keep-starknet-strange/snos?rev=4b4b3cdb614f9a6b736ff1b21a5ea75c87b7d83c#4b4b3cdb614f9a6b736ff1b21a5ea75c87b7d83c" dependencies = [ "proc-macro2", "quote", @@ -4457,8 +4478,9 @@ dependencies = [ [[package]] name = "cairo-vm" -version = "1.0.0-rc3" -source = "git+https://github.com/lambdaclass/cairo-vm#5d1181185a976c77956aaa4247846babd4d0e2df" +version = "1.0.0-rc5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e09134ea1e0be6c1fbd330f0945df0512fa70944fd0b3ecc2f74a6008f01e9da" dependencies = [ "anyhow", "ark-ff 0.4.2", @@ -4543,6 +4565,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chrono" version = "0.4.38" @@ -4892,9 +4920,20 @@ name = "cookie" version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" +dependencies = [ + "percent-encoding", + "time", + "version_check", +] + +[[package]] +name = "cookie" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" dependencies = [ "aes-gcm", - "base64 0.21.7", + "base64 0.22.1", "hkdf 0.12.4", "hmac 0.12.1", "percent-encoding", @@ -4917,7 +4956,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" dependencies = [ - "cookie", + "cookie 0.17.0", "idna 0.3.0", "log", "publicsuffix", @@ -5287,7 +5326,7 @@ dependencies = [ "async-trait", "axum 0.7.5", "color-eyre", - "mockall", + "mockall 0.13.0", "starknet", ] @@ -5668,7 +5707,7 @@ name = "e2e-tests" version = "0.1.0" dependencies = [ "orchestrator", - "reqwest 0.11.27", + "reqwest 0.12.5", "serde_json", "testcontainers", "tokio", @@ -5816,18 +5855,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "enum-as-inner" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "enum_dispatch" version = "0.3.13" @@ -5933,9 +5960,9 @@ dependencies = [ "color-eyre", "da-client-interface", "dotenv", - "mockall", + "mockall 0.12.1", "reqwest 0.12.5", - "rstest 0.18.2", + "rstest 0.22.0", "serde", "starknet", "tokio", @@ -5948,14 +5975,14 @@ dependencies = [ name = "ethereum-settlement-client" version = "0.1.0" dependencies = [ - "alloy 0.1.2", + "alloy 0.2.1", "async-trait", "c-kzg", "color-eyre", "dotenv", - "mockall", + "mockall 0.12.1", "reqwest 0.12.5", - "rstest 0.18.2", + "rstest 0.22.0", "serde", "settlement-client-interface", "snos", @@ -6661,9 +6688,9 @@ dependencies = [ name = "gps-fact-checker" version = "0.1.0" dependencies = [ - "alloy 0.1.2", + "alloy 0.2.1", "async-trait", - "cairo-vm 1.0.0-rc3", + "cairo-vm 1.0.0-rc5", "itertools 0.13.0", "starknet", "thiserror", @@ -6780,14 +6807,14 @@ dependencies = [ [[package]] name = "headers" -version = "0.3.9" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" +checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" dependencies = [ "base64 0.21.7", "bytes", "headers-core", - "http 0.2.12", + "http 1.1.0", "httpdate", "mime", "sha1", @@ -6795,11 +6822,11 @@ dependencies = [ [[package]] name = "headers-core" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" dependencies = [ - "http 0.2.12", + "http 1.1.0", ] [[package]] @@ -6859,51 +6886,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" -[[package]] -name = "hickory-proto" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner 0.6.0", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.4.0", - "ipnet", - "once_cell", - "rand 0.8.5", - "thiserror", - "tinyvec", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "hickory-resolver" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" -dependencies = [ - "cfg-if", - "futures-util", - "hickory-proto", - "ipconfig", - "lru-cache", - "once_cell", - "parking_lot 0.12.3", - "rand 0.8.5", - "resolv-conf", - "smallvec", - "thiserror", - "tokio", - "tracing", -] - [[package]] name = "hidapi" version = "1.5.0" @@ -7183,25 +7165,6 @@ dependencies = [ "tokio-rustls 0.24.1", ] -[[package]] -name = "hyper-rustls" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" -dependencies = [ - "futures-util", - "http 1.1.0", - "hyper 1.3.1", - "hyper-util", - "log", - "rustls 0.22.4", - "rustls-native-certs 0.7.0", - "rustls-pki-types", - "tokio", - "tokio-rustls 0.25.0", - "tower-service", -] - [[package]] name = "hyper-rustls" version = "0.27.2" @@ -7212,7 +7175,9 @@ dependencies = [ "http 1.1.0", "hyper 1.3.1", "hyper-util", + "log", "rustls 0.23.10", + "rustls-native-certs 0.7.0", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -7281,10 +7246,10 @@ dependencies = [ ] [[package]] -name = "hyperlocal-next" -version = "0.9.0" +name = "hyperlocal" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf569d43fa9848e510358c07b80f4adf34084ddc28c6a4a651ee8474c070dcc" +checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" dependencies = [ "hex", "http-body-util", @@ -7351,16 +7316,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.5.0" @@ -7689,6 +7644,26 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +[[package]] +name = "jemalloc-sys" +version = "0.5.4+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac6c1946e1cea1788cbfde01c993b52a10e2da07f4bac608228d1bed20bfebf2" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "jemallocator" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0de374a9f8e63150e6f5e8a60cc14c668226d7a347d8aee1a45766e3c4dd3bc" +dependencies = [ + "jemalloc-sys", + "libc", +] + [[package]] name = "jobserver" version = "0.1.31" @@ -8233,6 +8208,16 @@ 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 = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "minilp" version = "0.2.2" @@ -8286,7 +8271,21 @@ dependencies = [ "downcast", "fragile", "lazy_static", - "mockall_derive", + "mockall_derive 0.12.1", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c28b3fb6d753d28c20e826cd46ee611fda1cf3cde03a443a974043247c065a" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "mockall_derive 0.13.0", "predicates", "predicates-tree", ] @@ -8303,6 +8302,18 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "mockall_derive" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "341014e7f530314e9a1fdbc7400b244efea7122662c96bfa248c31da5bfb2020" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "mongodb" version = "2.8.2" @@ -8359,7 +8370,7 @@ checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e" [[package]] name = "move-abigen" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "bcs 0.1.4", @@ -8376,11 +8387,12 @@ dependencies = [ [[package]] name = "move-binary-format" version = "0.0.3" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "backtrace", "indexmap 1.9.3", + "move-bytecode-spec", "move-core-types", "ref-cast", "serde", @@ -8390,12 +8402,12 @@ dependencies = [ [[package]] name = "move-borrow-graph" version = "0.0.1" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" [[package]] name = "move-bytecode-source-map" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "bcs 0.1.4", @@ -8407,10 +8419,20 @@ dependencies = [ "serde", ] +[[package]] +name = "move-bytecode-spec" +version = "0.1.0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" +dependencies = [ + "once_cell", + "quote", + "syn 1.0.109", +] + [[package]] name = "move-bytecode-utils" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "move-binary-format", @@ -8422,7 +8444,7 @@ dependencies = [ [[package]] name = "move-bytecode-verifier" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "fail", "move-binary-format", @@ -8436,7 +8458,7 @@ dependencies = [ [[package]] name = "move-bytecode-viewer" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "clap 4.5.9", @@ -8451,7 +8473,7 @@ dependencies = [ [[package]] name = "move-cli" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "clap 4.5.9", @@ -8481,7 +8503,7 @@ dependencies = [ [[package]] name = "move-command-line-common" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "difference", @@ -8498,7 +8520,7 @@ dependencies = [ [[package]] name = "move-compiler" version = "0.0.1" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "bcs 0.1.4", @@ -8524,7 +8546,7 @@ dependencies = [ [[package]] name = "move-compiler-v2" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "abstract-domain-derive", "anyhow", @@ -8534,7 +8556,7 @@ dependencies = [ "ethnum", "flexi_logger", "im", - "itertools 0.12.1", + "itertools 0.13.0", "log", "move-binary-format", "move-bytecode-source-map", @@ -8555,7 +8577,7 @@ dependencies = [ [[package]] name = "move-core-types" version = "0.0.4" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "bcs 0.1.4", @@ -8577,7 +8599,7 @@ dependencies = [ [[package]] name = "move-coverage" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "bcs 0.1.4", @@ -8596,7 +8618,7 @@ dependencies = [ [[package]] name = "move-disassembler" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "clap 4.5.9", @@ -8613,13 +8635,13 @@ dependencies = [ [[package]] name = "move-docgen" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "clap 4.5.9", "codespan", "codespan-reporting", - "itertools 0.12.1", + "itertools 0.13.0", "log", "move-compiler", "move-core-types", @@ -8632,7 +8654,7 @@ dependencies = [ [[package]] name = "move-errmapgen" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "move-command-line-common", @@ -8644,7 +8666,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "codespan-reporting", @@ -8662,7 +8684,7 @@ dependencies = [ [[package]] name = "move-ir-to-bytecode-syntax" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "hex", @@ -8675,7 +8697,7 @@ dependencies = [ [[package]] name = "move-ir-types" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "hex", "move-command-line-common", @@ -8688,13 +8710,13 @@ dependencies = [ [[package]] name = "move-model" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "codespan", "codespan-reporting", "internment", - "itertools 0.12.1", + "itertools 0.13.0", "log", "move-binary-format", "move-bytecode-source-map", @@ -8714,12 +8736,12 @@ dependencies = [ [[package]] name = "move-package" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "clap 4.5.9", "colored", - "itertools 0.12.1", + "itertools 0.13.0", "move-abigen", "move-binary-format", "move-bytecode-source-map", @@ -8748,13 +8770,13 @@ dependencies = [ [[package]] name = "move-prover" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "atty", "clap 4.5.9", "codespan-reporting", - "itertools 0.12.1", + "itertools 0.13.0", "log", "move-abigen", "move-command-line-common", @@ -8775,14 +8797,14 @@ dependencies = [ [[package]] name = "move-prover-boogie-backend" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "async-trait", "codespan", "codespan-reporting", "futures", - "itertools 0.12.1", + "itertools 0.13.0", "log", "move-binary-format", "move-command-line-common", @@ -8804,12 +8826,12 @@ dependencies = [ [[package]] name = "move-prover-bytecode-pipeline" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "abstract-domain-derive", "anyhow", "codespan-reporting", - "itertools 0.12.1", + "itertools 0.13.0", "log", "move-binary-format", "move-core-types", @@ -8821,7 +8843,7 @@ dependencies = [ [[package]] name = "move-resource-viewer" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "hex", @@ -8834,13 +8856,13 @@ dependencies = [ [[package]] name = "move-stackless-bytecode" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "abstract-domain-derive", "codespan-reporting", "ethnum", "im", - "itertools 0.12.1", + "itertools 0.13.0", "log", "move-binary-format", "move-core-types", @@ -8853,7 +8875,7 @@ dependencies = [ [[package]] name = "move-stdlib" version = "0.1.1" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "hex", @@ -8876,7 +8898,7 @@ dependencies = [ [[package]] name = "move-symbol-pool" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "once_cell", "serde", @@ -8885,7 +8907,7 @@ dependencies = [ [[package]] name = "move-table-extension" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "better_any", "bytes", @@ -8900,14 +8922,14 @@ dependencies = [ [[package]] name = "move-unit-test" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "better_any", "clap 4.5.9", "codespan-reporting", "colored", - "itertools 0.12.1", + "itertools 0.13.0", "move-binary-format", "move-bytecode-utils", "move-command-line-common", @@ -8928,7 +8950,7 @@ dependencies = [ [[package]] name = "move-vm-runtime" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "better_any", "bytes", @@ -8952,7 +8974,7 @@ dependencies = [ [[package]] name = "move-vm-test-utils" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "anyhow", "bytes", @@ -8967,11 +8989,12 @@ dependencies = [ [[package]] name = "move-vm-types" version = "0.1.0" -source = "git+https://github.com/sota-zk-labs/aptos-core#e1d6b2a40c39c41d35819896a4d2f5610232bea0" +source = "git+https://github.com/aptos-labs/aptos-core#06900559ea5f03b380b1637b861cdab34501ed2d" dependencies = [ "bcs 0.1.4", + "bytes", "derivative", - "itertools 0.12.1", + "itertools 0.13.0", "move-binary-format", "move-core-types", "serde", @@ -8982,16 +9005,15 @@ dependencies = [ [[package]] name = "multer" -version = "2.1.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" +checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" dependencies = [ "bytes", "encoding_rs", "futures-util", - "http 0.2.12", + "http 1.1.0", "httparse", - "log", "memchr", "mime", "spin 0.9.8", @@ -9070,12 +9092,13 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nix" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.5.0", "cfg-if", + "cfg_aliases", "libc", ] @@ -9327,17 +9350,6 @@ dependencies = [ "libc", ] -[[package]] -name = "number_range" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60080faccd4ca50ad0b801b2be686136376b13f691f6eac84817e40973b2e1bb" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "num", -] - [[package]] name = "object" version = "0.32.2" @@ -9452,6 +9464,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" name = "orchestrator" version = "0.1.0" dependencies = [ + "alloy 0.2.1", "arc-swap", "async-std", "async-trait", @@ -9459,8 +9472,10 @@ dependencies = [ "aws-sdk-s3", "axum 0.7.5", "axum-macros", + "bincode 1.3.3", "bytes", - "cairo-vm 1.0.0-rc3", + "c-kzg", + "cairo-vm 1.0.0-rc5", "color-eyre", "da-client-interface", "dotenvy", @@ -9474,14 +9489,14 @@ dependencies = [ "log", "majin-blob-core", "majin-blob-types", - "mockall", + "mockall 0.12.1", "mongodb", "num", "num-bigint 0.4.5", "num-traits 0.2.19", "omniqueue", "prover-client-interface", - "rstest 0.18.2", + "rstest 0.22.0", "serde", "serde_json", "settlement-client-interface", @@ -10210,19 +10225,19 @@ dependencies = [ [[package]] name = "poem" -version = "1.3.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504774c97b0744c1ee108a37e5a65a9745a4725c4c06277521dabc28eb53a904" +version = "3.0.1" +source = "git+https://github.com/poem-web/poem.git?rev=809b2816d3504beeba140fef3fdfe9432d654c5b#809b2816d3504beeba140fef3fdfe9432d654c5b" dependencies = [ "anyhow", - "async-trait", "bytes", "chrono", - "cookie", + "cookie 0.18.1", "futures-util", "headers", - "http 0.2.12", - "hyper 0.14.29", + "http 1.1.0", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "mime", "multer", "nix", @@ -10230,19 +10245,21 @@ dependencies = [ "percent-encoding", "pin-project-lite", "poem-derive", - "quick-xml 0.30.0", + "quick-xml", "regex", "rfc7239", - "rustls-pemfile 1.0.4", + "rustls-pemfile 2.1.2", "serde", "serde_json", "serde_urlencoded", + "serde_yaml 0.9.34+deprecated", "smallvec", + "sync_wrapper 1.0.1", "tempfile", "thiserror", "time", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls 0.25.0", "tokio-stream", "tokio-util", "tracing", @@ -10251,11 +10268,10 @@ dependencies = [ [[package]] name = "poem-derive" -version = "1.3.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ddcf4680d8d867e1e375116203846acb088483fa2070244f90589f458bbb31" +version = "3.0.0" +source = "git+https://github.com/poem-web/poem.git?rev=809b2816d3504beeba140fef3fdfe9432d654c5b#809b2816d3504beeba140fef3fdfe9432d654c5b" dependencies = [ - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 2.0.66", @@ -10263,19 +10279,19 @@ dependencies = [ [[package]] name = "poem-openapi" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e69c569eb0671cc85e65cfb6bd960d0168d24732ff58825227b4d2a10167ba91" +version = "5.0.2" +source = "git+https://github.com/poem-web/poem.git?rev=809b2816d3504beeba140fef3fdfe9432d654c5b#809b2816d3504beeba140fef3fdfe9432d654c5b" dependencies = [ - "base64 0.13.1", + "base64 0.22.1", "bytes", "derive_more", "futures-util", + "indexmap 2.2.6", "mime", "num-traits 0.2.19", "poem", "poem-openapi-derive", - "quick-xml 0.23.1", + "quick-xml", "regex", "serde", "serde_json", @@ -10288,19 +10304,18 @@ dependencies = [ [[package]] name = "poem-openapi-derive" -version = "2.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "274cf13f710999977a3c1e396c2a5000d104075a7127ce6470fbdae4706be621" +version = "5.0.2" +source = "git+https://github.com/poem-web/poem.git?rev=809b2816d3504beeba140fef3fdfe9432d654c5b#809b2816d3504beeba140fef3fdfe9432d654c5b" dependencies = [ - "darling 0.14.4", - "http 0.2.12", - "indexmap 1.9.3", + "darling 0.20.9", + "http 1.1.0", + "indexmap 2.2.6", "mime", - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "regex", - "syn 1.0.109", + "syn 2.0.66", "thiserror", ] @@ -10480,15 +10495,6 @@ dependencies = [ "toml_edit 0.19.15", ] -[[package]] -name = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.7", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -10625,9 +10631,9 @@ name = "prover-client-interface" version = "0.1.0" dependencies = [ "async-trait", - "cairo-vm 1.0.0-rc3", + "cairo-vm 1.0.0-rc5", "gps-fact-checker", - "mockall", + "mockall 0.13.0", "snos", "thiserror", "utils", @@ -10666,19 +10672,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-xml" -version = "0.23.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" dependencies = [ "memchr", "serde", @@ -11007,7 +11003,7 @@ checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.7", "bytes", - "cookie", + "cookie 0.17.0", "cookie_store", "encoding_rs", "futures-core", @@ -11022,6 +11018,7 @@ dependencies = [ "js-sys", "log", "mime", + "mime_guess", "native-tls", "once_cell", "percent-encoding", @@ -11059,7 +11056,6 @@ dependencies = [ "futures-core", "futures-util", "h2 0.4.5", - "hickory-resolver", "http 1.1.0", "http-body 1.0.0", "http-body-util", @@ -11236,6 +11232,18 @@ dependencies = [ "rustc_version 0.4.0", ] +[[package]] +name = "rstest" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b423f0e62bdd61734b67cd21ff50871dfaeb9cc74f869dcd6af974fbcb19936" +dependencies = [ + "futures", + "futures-timer", + "rstest_macros 0.22.0", + "rustc_version 0.4.0", +] + [[package]] name = "rstest_macros" version = "0.17.0" @@ -11284,6 +11292,24 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "rstest_macros" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5e1711e7d14f74b12a58411c542185ef7fb7f2e7f8ee6e2940a883628522b42" +dependencies = [ + "cfg-if", + "glob", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "regex", + "relative-path", + "rustc_version 0.4.0", + "syn 2.0.66", + "unicode-ident", +] + [[package]] name = "ruint" version = "1.12.3" @@ -12076,8 +12102,9 @@ version = "0.1.0" dependencies = [ "async-trait", "axum 0.7.5", + "c-kzg", "color-eyre", - "mockall", + "mockall 0.12.1", "starknet", ] @@ -12178,13 +12205,13 @@ dependencies = [ name = "sharp-service" version = "0.1.0" dependencies = [ - "alloy 0.1.2", + "alloy 0.2.1", "async-trait", - "cairo-vm 1.0.0-rc3", + "cairo-vm 1.0.0-rc5", "gps-fact-checker", "hex", "prover-client-interface", - "reqwest 0.11.27", + "reqwest 0.12.5", "serde", "serde_json", "snos", @@ -12379,11 +12406,10 @@ dependencies = [ [[package]] name = "snos" version = "0.1.0" -source = "git+https://github.com/Moonsong-Labs/snos?branch=od/os-output-serde#809b3b2ad74ebde7ec48bddc10317809f8098c90" +source = "git+https://github.com/keep-starknet-strange/snos?rev=4b4b3cdb614f9a6b736ff1b21a5ea75c87b7d83c#4b4b3cdb614f9a6b736ff1b21a5ea75c87b7d83c" dependencies = [ "anyhow", "assert_matches", - "async-stream", "base64 0.21.7", "bitvec 1.0.1", "blockifier", @@ -12391,7 +12417,7 @@ dependencies = [ "cairo-lang-starknet", "cairo-lang-starknet-classes", "cairo-type-derive", - "cairo-vm 1.0.0-rc3", + "cairo-vm 1.0.0-rc5", "env_logger", "futures", "futures-util", @@ -12417,7 +12443,6 @@ dependencies = [ "starknet_api", "thiserror", "tokio", - "tokio-stream", "uuid 1.8.0", "zip", ] @@ -12496,15 +12521,14 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "starknet" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36f8002bf3d750dd2c0434aca8b5e88e2438cd6c452f4c18f34d0a8a9f42cb1a" +checksum = "1e633a772f59214c296d5037c95c36b72792c9360323818da2b625c7b4ec4b49" dependencies = [ "starknet-accounts", "starknet-contract", - "starknet-core 0.9.0", - "starknet-crypto 0.6.2", - "starknet-ff", + "starknet-core 0.11.1", + "starknet-crypto 0.7.1", "starknet-macros", "starknet-providers", "starknet-signers", @@ -12512,13 +12536,14 @@ dependencies = [ [[package]] name = "starknet-accounts" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e39a5807a735343493781dd5e640c4af838de470b0a73f420bed642fdc2ff1" +checksum = "eee8a6b588a22c7e79f5d8d4e33413387db63a8beb98be8610138541794cc0a5" dependencies = [ "async-trait", "auto_impl", - "starknet-core 0.9.0", + "starknet-core 0.11.1", + "starknet-crypto 0.7.1", "starknet-providers", "starknet-signers", "thiserror", @@ -12526,15 +12551,15 @@ dependencies = [ [[package]] name = "starknet-contract" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4996991356cd0e9499c663680eba7e77de4109e4995f652c1608899a65c09ee" +checksum = "a5f91344f1e0b81873b6dc235c50ae4d084c6ea4dd4a1e3e27ad895803adb610" dependencies = [ "serde", "serde_json", "serde_with 2.3.3", "starknet-accounts", - "starknet-core 0.9.0", + "starknet-core 0.11.1", "starknet-providers", "thiserror", ] @@ -12559,11 +12584,12 @@ dependencies = [ [[package]] name = "starknet-core" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ed286d637e34fb8ae1cd2f9615120ec8ff38d1cffd311ed7fdd497cdd2bd01f" +checksum = "d506e02a4083290d13b427dfe437fd95aa8b56315c455bb2f9cdeca76620d457" dependencies = [ "base64 0.21.7", + "crypto-bigint 0.5.5", "flate2", "hex", "serde", @@ -12571,8 +12597,8 @@ dependencies = [ "serde_json_pythonic", "serde_with 2.3.3", "sha3 0.10.8", - "starknet-crypto 0.6.2", - "starknet-ff", + "starknet-crypto 0.7.1", + "starknet-types-core", ] [[package]] @@ -12589,7 +12615,7 @@ dependencies = [ "num-traits 0.2.19", "rfc6979 0.4.0", "sha2 0.10.8", - "starknet-crypto-codegen", + "starknet-crypto-codegen 0.3.3", "starknet-curve 0.3.0", "starknet-ff", "zeroize", @@ -12609,12 +12635,32 @@ dependencies = [ "num-traits 0.2.19", "rfc6979 0.4.0", "sha2 0.10.8", - "starknet-crypto-codegen", + "starknet-crypto-codegen 0.3.3", "starknet-curve 0.4.2", "starknet-ff", "zeroize", ] +[[package]] +name = "starknet-crypto" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff2a821ad8d98c6c3e4d0e5097f3fe6e2ed120ada9d32be87cd1330c7923a2f0" +dependencies = [ + "crypto-bigint 0.5.5", + "hex", + "hmac 0.12.1", + "num-bigint 0.4.5", + "num-integer", + "num-traits 0.2.19", + "rfc6979 0.4.0", + "sha2 0.10.8", + "starknet-crypto-codegen 0.4.0", + "starknet-curve 0.5.0", + "starknet-types-core", + "zeroize", +] + [[package]] name = "starknet-crypto-codegen" version = "0.3.3" @@ -12626,6 +12672,17 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "starknet-crypto-codegen" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e179dedc3fa6da064e56811d3e05d446aa2f7459e4eb0e3e49378a337235437" +dependencies = [ + "starknet-curve 0.5.0", + "starknet-types-core", + "syn 2.0.66", +] + [[package]] name = "starknet-curve" version = "0.3.0" @@ -12644,6 +12701,15 @@ dependencies = [ "starknet-ff", ] +[[package]] +name = "starknet-curve" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56935b306dcf0b8f14bb2a1257164b8478bb8be4801dfae0923f5b266d1b457c" +dependencies = [ + "starknet-types-core", +] + [[package]] name = "starknet-ff" version = "0.3.7" @@ -12655,7 +12721,6 @@ dependencies = [ "crypto-bigint 0.5.5", "getrandom 0.2.15", "hex", - "num-bigint 0.4.5", "serde", ] @@ -12684,30 +12749,31 @@ dependencies = [ [[package]] name = "starknet-macros" -version = "0.1.7" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95d549d3078bdbe775d0deaa8ddb57a19942989ce7c1f2dfd60beeb322bb4945" +checksum = "f4fe4f8d615329410578cbedcdbaa4a36c7f28f68c3f3ac56006cfbdaeaa2b41" dependencies = [ - "starknet-core 0.10.0", + "starknet-core 0.11.1", "syn 2.0.66", ] [[package]] name = "starknet-providers" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4bd1c262936543d6d14d299f476585e8c9625a4e284d9255b54f1c2e68e64a" +checksum = "59c85e0a0f4563ae95dfeae14ea0f0c70610efc0ec2462505c64eff5765e7b97" dependencies = [ "async-trait", "auto_impl", "ethereum-types", "flate2", + "getrandom 0.2.15", "log", "reqwest 0.11.27", "serde", "serde_json", "serde_with 2.3.3", - "starknet-core 0.9.0", + "starknet-core 0.11.1", "thiserror", "url", ] @@ -12721,9 +12787,9 @@ dependencies = [ "color-eyre", "dotenv", "lazy_static", - "mockall", + "mockall 0.12.1", "reqwest 0.12.5", - "rstest 0.18.2", + "rstest 0.22.0", "serde", "settlement-client-interface", "starknet", @@ -12735,17 +12801,18 @@ dependencies = [ [[package]] name = "starknet-signers" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c5eb659e66b56ceafb9025cd601226d8f34d273f1b826cd4053ab6333ff0898" +checksum = "c17da2139119dbe3aacf1d5d4338798a5c489d17f424916ceb9d2efd83554f87" dependencies = [ "async-trait", "auto_impl", "crypto-bigint 0.5.5", "eth-keystore", + "getrandom 0.2.15", "rand 0.8.5", - "starknet-core 0.9.0", - "starknet-crypto 0.6.2", + "starknet-core 0.11.1", + "starknet-crypto 0.7.1", "thiserror", ] @@ -13001,9 +13068,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d71e19bca02c807c9faa67b5a47673ff231b6e7449b251695188522f1dc44b2" +checksum = "c837dc8852cb7074e46b444afb81783140dab12c58867b49fb3898fbafedf7ea" dependencies = [ "paste", "proc-macro2", @@ -13022,6 +13089,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" @@ -13141,9 +13211,9 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "testcontainers" -version = "0.18.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2c9b71635ab25d4f789a86678d114a4f390467c8b93fd7feeaf7c443732a511" +checksum = "5f7d80fe0008971413157e67062150cbf508b92f0eb525b9f49de1aec4267f24" dependencies = [ "async-trait", "bollard", @@ -13156,7 +13226,7 @@ dependencies = [ "log", "memchr", "parse-display", - "reqwest 0.12.5", + "pin-project-lite", "serde", "serde_json", "serde_with 3.8.1", @@ -13256,26 +13326,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "tikv-jemalloc-sys" -version = "0.5.4+5.3.0-patched" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - [[package]] name = "time" version = "0.3.36" @@ -13556,17 +13606,6 @@ dependencies = [ "winnow 0.5.40", ] -[[package]] -name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.2.6", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.21.1" @@ -13835,7 +13874,7 @@ dependencies = [ "async-trait", "cfg-if", "data-encoding", - "enum-as-inner 0.4.0", + "enum-as-inner", "futures-channel", "futures-io", "futures-util", @@ -14047,6 +14086,15 @@ dependencies = [ "unic-common", ] +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + [[package]] name = "unicode-bidi" version = "0.3.15" diff --git a/Cargo.toml b/Cargo.toml index aa204f97..ca149e7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,18 +1,18 @@ [workspace] resolver = "2" members = [ - "crates/orchestrator", - "crates/da-clients/da-client-interface", - "crates/da-clients/ethereum", - "crates/prover-services/prover-client-interface", - "crates/prover-services/gps-fact-checker", - "crates/prover-services/sharp-service", - "crates/utils", - "crates/settlement-clients/settlement-client-interface", - "crates/settlement-clients/ethereum", - "crates/settlement-clients/starknet", - "e2e-tests", - "crates/settlement-clients/aptos", + "crates/orchestrator", + "crates/da-clients/da-client-interface", + "crates/da-clients/ethereum", + "crates/prover-services/prover-client-interface", + "crates/prover-services/gps-fact-checker", + "crates/prover-services/sharp-service", + "crates/utils", + "crates/settlement-clients/settlement-client-interface", + "crates/settlement-clients/ethereum", + "crates/settlement-clients/starknet", + "e2e-tests", + "crates/settlement-clients/aptos", ] [workspace.package] @@ -25,7 +25,7 @@ authors = ["Apoorv Sadana <@apoorvsadana>"] [workspace.dependencies] num = { version = "0.4.1" } async-trait = { version = "0.1.77" } -alloy = { version = "0.1.2", features = ["full"] } +alloy = { version = "0.2.1", features = ["full"] } axum = { version = "0.7.4" } axum-macros = "0.4.1" bincode = "1.3.3" @@ -33,13 +33,13 @@ color-eyre = "0.6.2" c-kzg = "1.0.0" dotenvy = "0.15.7" futures = "0.3.30" -mongodb = { version = "2.8.1" } +mongodb = { version = "2.8.2" } omniqueue = { version = "0.2.0" } -reqwest = { version = "0.11.24" } -rstest = "0.18.2" +reqwest = { version = "0.12.5" } +rstest = "0.22.0" serde = { version = "1.0.197" } serde_json = "1.0.114" -starknet = "0.9.0" +starknet = "0.11.0" tempfile = "3.8.1" thiserror = "1.0.57" tokio = { version = "1.37.0" } @@ -57,25 +57,24 @@ lazy_static = "1.4.0" stark_evm_adapter = "0.1.1" hex = "0.4" itertools = "0.13.0" -mockall = "0.12.1" -testcontainers = "0.18.0" - +mockall = "0.13.0" +testcontainers = "0.21.1" # Cairo VM -cairo-vm = { git = "https://github.com/lambdaclass/cairo-vm", features = [ - "extensive_hints", - "cairo-1-hints", +cairo-vm = { version = "1.0.0-rc5", features = [ + "extensive_hints", + "cairo-1-hints", ] } # TODO: we currently use the Moonsong fork & the os-output-serde branch so we # can deserialize our snos input json into a StarknetOsInput struct. # TODO: update back to the main repo once it's merged # Sharp (Starkware) -snos = { git = "https://github.com/keep-starknet-strange/snos" } +snos = { git = "https://github.com/keep-starknet-strange/snos", rev = "4b4b3cdb614f9a6b736ff1b21a5ea75c87b7d83c" } # Madara prover API -madara-prover-common = { git = "https://github.com/Moonsong-Labs/madara-prover-api", branch = "od/use-latest-cairo-vm" } -madara-prover-rpc-client = { git = "https://github.com/Moonsong-Labs/madara-prover-api", branch = "od/use-latest-cairo-vm" } +madara-prover-common = { git = "https://github.com/Moonsong-Labs/madara-prover-api", branch = "main" } +madara-prover-rpc-client = { git = "https://github.com/Moonsong-Labs/madara-prover-api", branch = "main" } # Project da-client-interface = { path = "crates/da-clients/da-client-interface" } @@ -91,7 +90,8 @@ gps-fact-checker = { path = "crates/prover-services/gps-fact-checker" } sharp-service = { path = "crates/prover-services/sharp-service" } orchestrator = { path = "crates/orchestrator" } -aptos-sdk = { git = "https://github.com/sota-zk-labs/aptos-core" } +aptos-sdk = { git = "https://github.com/aptos-labs/aptos-core" } + [patch.crates-io] merlin = { git = "https://github.com/aptos-labs/merlin" } x25519-dalek = { git = "https://github.com/Tranduy1dol/x25519-dalek", branch = "zeroize_v1.7" } diff --git a/crates/orchestrator/src/jobs/da_job/mod.rs b/crates/orchestrator/src/jobs/da_job/mod.rs index 4b21b9c4..1fd3bd41 100644 --- a/crates/orchestrator/src/jobs/da_job/mod.rs +++ b/crates/orchestrator/src/jobs/da_job/mod.rs @@ -10,16 +10,17 @@ use lazy_static::lazy_static; use num_bigint::{BigUint, ToBigUint}; use num_traits::{Num, Zero}; // -use starknet::core::types::{BlockId, FieldElement, MaybePendingStateUpdate, StateUpdate, StorageEntry}; +use starknet::core::types::{BlockId, Felt, MaybePendingStateUpdate, StateUpdate, StorageEntry}; use starknet::providers::Provider; use tracing::log; use uuid::Uuid; -use super::types::{JobItem, JobStatus, JobType, JobVerificationStatus}; -use super::Job; use crate::config::Config; use crate::constants::BLOB_DATA_FILE_NAME; +use super::Job; +use super::types::{JobItem, JobStatus, JobType, JobVerificationStatus}; + lazy_static! { /// EIP-4844 BLS12-381 modulus. /// @@ -149,13 +150,13 @@ fn fft_transformation(elements: Vec) -> Vec { transform } -fn convert_to_biguint(elements: Vec) -> Vec { +fn convert_to_biguint(elements: Vec) -> Vec { // Initialize the vector with 4096 BigUint zeros let mut biguint_vec = vec![BigUint::zero(); 4096]; // Iterate over the elements and replace the zeros in the biguint_vec for (i, element) in elements.iter().take(4096).enumerate() { - // Convert FieldElement to [u8; 32] + // Convert Felt to [u8; 32] let bytes: [u8; 32] = element.to_bytes_be(); // Convert [u8; 32] to BigUint @@ -172,14 +173,14 @@ fn data_to_blobs(blob_size: u64, block_data: Vec) -> Result // Validate blob size if blob_size < 32 { return Err(eyre!( - "Blob size must be at least 32 bytes to accommodate a single FieldElement/BigUint, but was {}", + "Blob size must be at least 32 bytes to accommodate a single Felt/BigUint, but was {}", blob_size, )); } let mut blobs: Vec> = Vec::new(); - // Convert all FieldElements to bytes first + // Convert all Felts to bytes first let mut bytes: Vec = block_data.iter().flat_map(|element| element.to_bytes_be().to_vec()).collect(); // Process bytes in chunks of blob_size @@ -204,27 +205,27 @@ async fn state_update_to_blob_data( block_no: u64, state_update: StateUpdate, config: &Config, -) -> Result> { +) -> Result> { let state_diff = state_update.state_diff; - let mut blob_data: Vec = vec![ - FieldElement::from(state_diff.storage_diffs.len()), + let mut blob_data: Vec = vec![ + Felt::from(state_diff.storage_diffs.len()), // @note: won't need this if while producing the block we are attaching the block number // and the block hash - FieldElement::ONE, - FieldElement::ONE, - FieldElement::from(block_no), + Felt::ONE, + Felt::ONE, + Felt::from(block_no), state_update.block_hash, ]; - let storage_diffs: HashMap> = + let storage_diffs: HashMap> = state_diff.storage_diffs.iter().map(|item| (item.address, &item.storage_entries)).collect(); - let declared_classes: HashMap = + let declared_classes: HashMap = state_diff.declared_classes.iter().map(|item| (item.class_hash, item.compiled_class_hash)).collect(); - let deployed_contracts: HashMap = + let deployed_contracts: HashMap = state_diff.deployed_contracts.iter().map(|item| (item.address, item.class_hash)).collect(); - let replaced_classes: HashMap = + let replaced_classes: HashMap = state_diff.replaced_classes.iter().map(|item| (item.contract_address, item.class_hash)).collect(); - let mut nonces: HashMap = + let mut nonces: HashMap = state_diff.nonces.iter().map(|item| (item.contract_address, item.nonce)).collect(); // Loop over storage diffs @@ -236,7 +237,7 @@ async fn state_update_to_blob_data( // @note: if nonce is null and there is some len of writes, make an api call to get the contract // nonce for the block - if nonce.is_none() && !writes.is_empty() && addr != FieldElement::ONE { + if nonce.is_none() && !writes.is_empty() && addr != Felt::ONE { let get_current_nonce_result = config.starknet_client().get_nonce(BlockId::Number(block_no), addr).await; nonce = match get_current_nonce_result { @@ -253,7 +254,7 @@ async fn state_update_to_blob_data( // block number and hash // @note: ONE special address can be used to mark the range of block, if in future // the team wants to submit multiple blocks in a sinle blob etc. - if addr == FieldElement::ONE && da_word == FieldElement::ONE { + if addr == Felt::ONE && da_word == Felt::ONE { continue; } blob_data.push(addr); @@ -269,7 +270,7 @@ async fn state_update_to_blob_data( } } // Handle declared classes - blob_data.push(FieldElement::from(declared_classes.len())); + blob_data.push(Felt::from(declared_classes.len())); for (class_hash, compiled_class_hash) in &declared_classes { blob_data.push(*class_hash); @@ -283,7 +284,7 @@ async fn state_update_to_blob_data( } /// To store the blob data using the storage client with path /blob_data.txt -async fn store_blob_data(blob_data: Vec, block_number: u64, config: &Config) -> Result<()> { +async fn store_blob_data(blob_data: Vec, block_number: u64, config: &Config) -> Result<()> { let storage_client = config.storage(); let key = block_number.to_string() + "/" + BLOB_DATA_FILE_NAME; let data_blob_big_uint = convert_to_biguint(blob_data.clone()); @@ -306,7 +307,7 @@ async fn store_blob_data(blob_data: Vec, block_number: u64, config /// DA word encoding: /// |---padding---|---class flag---|---new nonce---|---num changes---| /// 127 bits 1 bit 64 bits 64 bits -fn da_word(class_flag: bool, nonce_change: Option, num_changes: u64) -> FieldElement { +fn da_word(class_flag: bool, nonce_change: Option, num_changes: u64) -> Felt { // padding of 127 bits let mut binary_string = "0".repeat(127); @@ -338,7 +339,7 @@ fn da_word(class_flag: bool, nonce_change: Option, num_changes: u6 // Now convert the BigUint to a decimal string let decimal_string = biguint.to_str_radix(10); - FieldElement::from_dec_str(&decimal_string).expect("issue while converting to fieldElement") + Felt::from_dec_str(&decimal_string).expect("issue while converting to Felt") } #[cfg(test)] @@ -348,19 +349,20 @@ mod tests { use std::io::Read; use ::serde::{Deserialize, Serialize}; + use da_client_interface::MockDaClient; use httpmock::prelude::*; use majin_blob_core::blob; use majin_blob_types::serde; use majin_blob_types::state_diffs::UnorderedEq; - // use majin_blob_types::serde; - use crate::data_storage::MockDataStorage; - use da_client_interface::MockDaClient; use rstest::rstest; use serde_json::json; - use super::*; + // use majin_blob_types::serde; + use crate::data_storage::MockDataStorage; use crate::tests::common::init_config; + use super::*; + #[rstest] #[case(false, 1, 1, "18446744073709551617")] #[case(false, 1, 0, "18446744073709551616")] @@ -372,30 +374,30 @@ mod tests { #[case] num_changes: u64, #[case] expected: String, ) { - let new_nonce = if new_nonce > 0 { Some(FieldElement::from(new_nonce)) } else { None }; + let new_nonce = if new_nonce > 0 { Some(Felt::from(new_nonce)) } else { None }; let da_word = da_word(class_flag, new_nonce, num_changes); - let expected = FieldElement::from_dec_str(expected.as_str()).unwrap(); + let expected = Felt::from_dec_str(expected.as_str()).unwrap(); assert_eq!(da_word, expected); } #[rstest] #[case( - 631861, - "src/jobs/da_job/test_data/state_update_from_block_631861.txt", - "src/jobs/da_job/test_data/test_blob_631861.txt", - "src/jobs/da_job/test_data/nonces_from_block_631861.txt" + 631861, + "src/jobs/da_job/test_data/state_update_from_block_631861.txt", + "src/jobs/da_job/test_data/test_blob_631861.txt", + "src/jobs/da_job/test_data/nonces_from_block_631861.txt" )] #[case( - 638353, - "src/jobs/da_job/test_data/state_update_from_block_638353.txt", - "src/jobs/da_job/test_data/test_blob_638353.txt", - "src/jobs/da_job/test_data/nonces_from_block_638353.txt" + 638353, + "src/jobs/da_job/test_data/state_update_from_block_638353.txt", + "src/jobs/da_job/test_data/test_blob_638353.txt", + "src/jobs/da_job/test_data/nonces_from_block_638353.txt" )] #[case( - 640641, - "src/jobs/da_job/test_data/state_update_from_block_640641.txt", - "src/jobs/da_job/test_data/test_blob_640641.txt", - "src/jobs/da_job/test_data/nonces_from_block_640641.txt" + 640641, + "src/jobs/da_job/test_data/state_update_from_block_640641.txt", + "src/jobs/da_job/test_data/test_blob_640641.txt", + "src/jobs/da_job/test_data/nonces_from_block_640641.txt" )] #[tokio::test] async fn test_state_update_to_blob_data( @@ -424,7 +426,7 @@ mod tests { None, Some(storage_client), ) - .await; + .await; get_nonce_attached(&server, nonce_file_path); @@ -504,7 +506,7 @@ mod tests { let nonce = entry.nonce.clone(); let response = json!({ "id": 1,"jsonrpc":"2.0","result": nonce }); let field_element = - FieldElement::from_dec_str(&address).expect("issue while converting the hex to field").to_bytes_be(); + Felt::from_dec_str(&address).expect("issue while converting the hex to field").to_bytes_be(); let hex_field_element = vec_u8_to_hex_string(&field_element); server.mock(|when, then| { diff --git a/crates/prover-services/gps-fact-checker/src/fact_info.rs b/crates/prover-services/gps-fact-checker/src/fact_info.rs index e7156ef9..7cf6a16e 100644 --- a/crates/prover-services/gps-fact-checker/src/fact_info.rs +++ b/crates/prover-services/gps-fact-checker/src/fact_info.rs @@ -8,7 +8,7 @@ use cairo_vm::types::builtin_name::BuiltinName; use cairo_vm::types::relocatable::MaybeRelocatable; use cairo_vm::vm::runners::cairo_pie::CairoPie; use cairo_vm::Felt252; -use starknet::core::types::FieldElement; +use starknet::core::types::Felt; use utils::ensure; use super::error::FactCheckerError; @@ -26,12 +26,12 @@ pub struct FactInfo { pub fact: B256, } -pub fn get_fact_info(cairo_pie: &CairoPie, program_hash: Option) -> Result { +pub fn get_fact_info(cairo_pie: &CairoPie, program_hash: Option) -> Result { let program_output = get_program_output(cairo_pie)?; let fact_topology = get_fact_topology(cairo_pie, program_output.len())?; let program_hash = match program_hash { Some(hash) => hash, - None => compute_program_hash_chain(&cairo_pie.metadata.program, BOOTLOADER_VERSION)?, + None => Felt::from_bytes_be(&compute_program_hash_chain(&cairo_pie.metadata.program, BOOTLOADER_VERSION)?.to_bytes_be()), }; let output_root = generate_merkle_root(&program_output, &fact_topology)?; let fact = keccak256([program_hash.to_bytes_be(), *output_root.node_hash].concat()); diff --git a/crates/settlement-clients/starknet/src/conversion.rs b/crates/settlement-clients/starknet/src/conversion.rs index 816999ea..3c3f34fb 100644 --- a/crates/settlement-clients/starknet/src/conversion.rs +++ b/crates/settlement-clients/starknet/src/conversion.rs @@ -1,9 +1,9 @@ -use starknet::core::types::FieldElement; +use starknet::core::types::Felt; -pub(crate) fn slice_slice_u8_to_vec_field(slices: &[[u8; 32]]) -> Vec { +pub(crate) fn slice_slice_u8_to_vec_field(slices: &[[u8; 32]]) -> Vec { slices.iter().map(slice_u8_to_field).collect() } -pub(crate) fn slice_u8_to_field(slice: &[u8; 32]) -> FieldElement { - FieldElement::from_byte_slice_be(slice).expect("could not convert u8 slice to FieldElement") +pub(crate) fn slice_u8_to_field(slice: &[u8; 32]) -> Felt { + Felt::from_bytes_be_slice(slice) } diff --git a/crates/settlement-clients/starknet/src/lib.rs b/crates/settlement-clients/starknet/src/lib.rs index abcd10df..d36121e0 100644 --- a/crates/settlement-clients/starknet/src/lib.rs +++ b/crates/settlement-clients/starknet/src/lib.rs @@ -1,6 +1,3 @@ -pub mod config; -pub mod conversion; - use std::sync::Arc; use async_trait::async_trait; @@ -8,30 +5,33 @@ use color_eyre::eyre::eyre; use color_eyre::Result; use lazy_static::lazy_static; use mockall::{automock, predicate::*}; -use starknet::accounts::ConnectedAccount; -use starknet::core::types::{ExecutionResult, MaybePendingTransactionReceipt}; -use starknet::providers::Provider; use starknet::{ accounts::{Account, Call, ExecutionEncoding, SingleOwnerAccount}, core::{ - types::{BlockId, BlockTag, FieldElement, FunctionCall}, + types::{BlockId, BlockTag, Felt, FunctionCall}, utils::get_selector_from_name, }, providers::{jsonrpc::HttpTransport, JsonRpcClient}, signers::{LocalWallet, SigningKey}, }; -use tokio::time::{sleep, Duration}; +use starknet::accounts::ConnectedAccount; +use starknet::core::types::ExecutionResult; +use starknet::providers::Provider; +use tokio::time::{Duration, sleep}; -use settlement_client_interface::{SettlementClient, SettlementVerificationStatus, SETTLEMENT_SETTINGS_NAME}; +use settlement_client_interface::{SETTLEMENT_SETTINGS_NAME, SettlementClient, SettlementVerificationStatus}; use utils::env_utils::get_env_var_or_panic; use utils::settings::SettingsProvider; use crate::config::StarknetSettlementConfig; use crate::conversion::{slice_slice_u8_to_vec_field, slice_u8_to_field}; +pub mod config; +pub mod conversion; + pub struct StarknetSettlementClient { pub account: SingleOwnerAccount>, LocalWallet>, - pub core_contract_address: FieldElement, + pub core_contract_address: Felt, pub tx_finality_retry_delay_in_seconds: u64, } @@ -49,15 +49,15 @@ impl StarknetSettlementClient { let provider = Arc::new(JsonRpcClient::new(HttpTransport::new(settlement_cfg.rpc_url))); let public_key = get_env_var_or_panic(ENV_PUBLIC_KEY); - let signer_address = FieldElement::from_hex_be(&public_key).expect("invalid signer address"); + let signer_address = Felt::from_hex(&public_key).expect("invalid signer address"); // TODO: Very insecure way of building the signer. Needs to be adjusted. let private_key = get_env_var_or_panic(ENV_PRIVATE_KEY); - let signer = FieldElement::from_hex_be(&private_key).expect("Invalid private key"); + let signer = Felt::from_hex(&private_key).expect("Invalid private key"); let signer = LocalWallet::from(SigningKey::from_secret_scalar(signer)); let core_contract_address = - FieldElement::from_hex_be(&settlement_cfg.core_contract_address).expect("Invalid core contract address"); + Felt::from_hex(&settlement_cfg.core_contract_address).expect("Invalid core contract address"); let account = SingleOwnerAccount::new( provider.clone(), @@ -76,18 +76,18 @@ impl StarknetSettlementClient { } lazy_static! { - pub static ref CONTRACT_WRITE_UPDATE_STATE_SELECTOR: FieldElement = + pub static ref CONTRACT_WRITE_UPDATE_STATE_SELECTOR: Felt = get_selector_from_name("update_state").expect("Invalid update state selector"); // TODO: `stateBlockNumber` does not exists yet in our implementation: // https://github.com/keep-starknet-strange/piltover // It should get added to match the solidity implementation of the core contract. - pub static ref CONTRACT_READ_STATE_BLOCK_NUMBER: FieldElement = + pub static ref CONTRACT_READ_STATE_BLOCK_NUMBER: Felt = get_selector_from_name("stateBlockNumber").expect("Invalid update state selector"); } // TODO: Note that we already have an implementation of the appchain core contract client available here: // https://github.com/keep-starknet-strange/zaun/tree/main/crates/l3/appchain-core-contract-client -// However, this implementation uses different FieldElement types, and incorporating all of them +// However, this implementation uses different Felt types, and incorporating all of them // into this repository would introduce unnecessary complexity. // Therefore, we will wait for the update of starknet_rs in the Zaun repository before adapting // the StarknetSettlementClient implementation. @@ -111,10 +111,10 @@ impl SettlementClient for StarknetSettlementClient { ) -> Result { let program_output = slice_slice_u8_to_vec_field(program_output.as_slice()); let onchain_data_hash = slice_u8_to_field(&onchain_data_hash); - let mut calldata: Vec = Vec::with_capacity(program_output.len() + 2); + let mut calldata: Vec = Vec::with_capacity(program_output.len() + 2); calldata.extend(program_output); calldata.push(onchain_data_hash); - calldata.push(FieldElement::from(onchain_data_size)); + calldata.push(Felt::from(onchain_data_size)); let invoke_result = self .account .execute(vec![Call { @@ -135,22 +135,16 @@ impl SettlementClient for StarknetSettlementClient { /// Should verify the inclusion of a tx in the settlement layer async fn verify_tx_inclusion(&self, tx_hash: &str) -> Result { - let tx_hash = FieldElement::from_hex_be(tx_hash)?; + let tx_hash = Felt::from_hex(tx_hash)?; let tx_receipt = self.account.provider().get_transaction_receipt(tx_hash).await?; - match tx_receipt { - MaybePendingTransactionReceipt::Receipt(tx) => match tx.execution_result() { - ExecutionResult::Succeeded => Ok(SettlementVerificationStatus::Verified), - ExecutionResult::Reverted { reason } => { - Ok(SettlementVerificationStatus::Rejected(format!("Tx {} has been reverted: {}", tx_hash, reason))) - } - }, - MaybePendingTransactionReceipt::PendingReceipt(tx) => match tx.execution_result() { - ExecutionResult::Succeeded => Ok(SettlementVerificationStatus::Pending), - ExecutionResult::Reverted { reason } => Ok(SettlementVerificationStatus::Rejected(format!( - "Pending tx {} has been reverted: {}", - tx_hash, reason - ))), - }, + if tx_receipt.block.is_pending() { + return Ok(SettlementVerificationStatus::Pending); + } + match tx_receipt.receipt.execution_result() { + ExecutionResult::Succeeded => { Ok(SettlementVerificationStatus::Verified) } + ExecutionResult::Reverted { reason } => { + Ok(SettlementVerificationStatus::Rejected(format!("Tx {} has been reverted: {}", tx_hash, reason))) + } } } @@ -166,10 +160,10 @@ impl SettlementClient for StarknetSettlementClient { let duration_to_wait_between_polling = Duration::from_secs(self.tx_finality_retry_delay_in_seconds); sleep(duration_to_wait_between_polling).await; - let tx_hash = FieldElement::from_hex_be(tx_hash)?; + let tx_hash = Felt::from_hex(tx_hash)?; loop { let tx_receipt = self.account.provider().get_transaction_receipt(tx_hash).await?; - if let MaybePendingTransactionReceipt::PendingReceipt(_) = tx_receipt { + if tx_receipt.block.is_pending() { retries += 1; if retries > MAX_RETRIES_VERIFY_TX_FINALITY { return Err(eyre!("Max retries exceeeded while waiting for tx {tx_hash} finality.")); @@ -199,6 +193,6 @@ impl SettlementClient for StarknetSettlementClient { if block_number.is_empty() { return Err(eyre!("Could not fetch last block number from core contract.")); } - Ok(block_number[0].try_into()?) + Ok(block_number[0].to_le_digits()[0]) } }