From ce474c88d06d485fb61dc30cc2a8f91fc8588da6 Mon Sep 17 00:00:00 2001 From: FrancoGiachetta Date: Fri, 5 Jul 2024 15:27:28 -0300 Subject: [PATCH 1/6] adapt to new blockifier --- Cargo.lock | 240 ++++++++++-------- Cargo.toml | 2 +- replay/src/main.rs | 2 +- rpc-state-reader/Cargo.toml | 6 +- .../src/blockifier_state_reader.rs | 31 ++- 5 files changed, 149 insertions(+), 132 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ce6b7a..f1eba87 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -442,7 +442,7 @@ dependencies = [ [[package]] name = "blockifier" version = "0.7.0-dev.1" -source = "git+https://github.com/lambdaclass/blockifier?rev=e8c166195e601ef6c4951f135fdf660a9b795819#e8c166195e601ef6c4951f135fdf660a9b795819" +source = "git+https://github.com/lambdaclass/blockifier?rev=73c8798e979c6e4b51f8b83efa469dba5eb4281b#73c8798e979c6e4b51f8b83efa469dba5eb4281b" dependencies = [ "anyhow", "ark-ec", @@ -472,9 +472,10 @@ dependencies = [ "phf", "serde", "serde_json", + "sha2", "sha3", "starknet-crypto 0.6.2", - "starknet-types-core 0.1.4", + "starknet-types-core 0.1.2", "starknet_api", "strum", "strum_macros", @@ -556,9 +557,9 @@ dependencies = [ [[package]] name = "cairo-lang-casm" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d9c31baeb6b52586b5adc88f01e90f86389d63d94363c562de5c79352e545b" +checksum = "6296d5748288d9fb97175d31aff9f68ea3f602456923895e512b078e9a2210a0" dependencies = [ "cairo-lang-utils", "indoc", @@ -570,9 +571,9 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7148cb2d72a3db24a6d2ef2b2602102cc5099cb9f6b913e5047fb009cb3a22a1" +checksum = "a7be5083c3328dad2248a94f0a24b3520c588e7d3bd5891770e4c91d3facade3" dependencies = [ "anyhow", "cairo-lang-defs", @@ -593,18 +594,18 @@ dependencies = [ [[package]] name = "cairo-lang-debug" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a761eb8e31ea65a2dd45f729c74f1770315f97124dad93d1f6853a10d460c6b" +checksum = "2a3cbf67fd766cb7ed48b72e6abf7041857518c9b9fd42475a60c138671c6603" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d60bc5d72fe7a95ba34e041dcbdf1cf3bfccb87008a515514b74913fa8ff05" +checksum = "7b284e41dfc158dfbdc02612dbfdb27a55547d23063bdc53105eeec41d8df006" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -619,9 +620,9 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356089e1b0a0ba9e115566191745613b3806a20259ad76764df82ab534d5412a" +checksum = "c6314b24901af8be75cd0e1363e3ff1a8020066372501f4cfc9161726b06ec2a" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -631,9 +632,9 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc43246cc2e5afd5a028bcdd63876ac3f8b1f4fb3ff785daaa0f0fbb51c9d906" +checksum = "4f95f5c8f7ea75580d164b5304251022e3d47f43fc1c778a01381b55ca9f268c" dependencies = [ "cairo-lang-utils", "good_lp", @@ -641,9 +642,9 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bcb9a4a40e53fa099774bd08bbcc3430f51213cc7fb1b50c2e9d01155731798" +checksum = "d3e58b80f0b413ef1320358fde1a0877fc3fbf740f5cead0de3e947a1bc3bfd4" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -655,9 +656,9 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba60e1e2477aa0f610ccf29189097d580464607c94b51741e1c18e64d6cee5f" +checksum = "abe6d604a06ea96c05b3666f2e8fac63cb8709e13667de272912f81db004a16b" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -680,9 +681,9 @@ dependencies = [ [[package]] name = "cairo-lang-parser" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f16ba1535e0cc5e79c2eff6592859bbdac03dc53d4dcdd26dbdbc04a77c3f5c" +checksum = "eaf1c279de47a77422f81b8a98023cd523cf0ae79f7153d60c4cf8b62b8ece2f" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -700,9 +701,9 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81c8cf6e0ee3d6b19429cc1663738b22f1ecea7d51bf7452e8e1086f08798baf" +checksum = "a1177a07498bdf45cba62f0c727388ff7433072847dbf701c58fa3c3e358154e" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -719,9 +720,9 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67f9da66325ce7ed6c002360f26106fe79deb9f8a2fca30abdbb8d388da7bb46" +checksum = "0c90d812ec983c5a8e3173aca3fc55036b9739201c89f30271ee14a4c1189379" dependencies = [ "cairo-lang-debug", "quote", @@ -730,9 +731,9 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e198af1ab3d05c7fb8b6a9a7a2e9bce245a6c855df5f770b751d29874a23b152" +checksum = "3985495d7e9dc481e97135d7139cfa098024351fb51d5feef8366b5fbc104807" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -744,9 +745,9 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf211f5431e2a6f4802b1b6483bf8e998e506a3be5369ed54a8807aae6e4dbf" +checksum = "fcc7c5969d107d24dbd7612ab7afec65d25475fe51d4bb708e3c773f2346c92b" dependencies = [ "ark-ff", "ark-secp256k1", @@ -775,9 +776,9 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7df81521c2125e3e95b683cc99374db1aebd7ddb317c5ca3dd92a235a9eb13" +checksum = "d5cfadbb9ca3479a6b5c02c0a125a5747835ba57a2de9c4e9764f42d85abe059" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -800,9 +801,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07da3ca1434c62a7cc7cd77d2941ef47a1c23b37325781b59407b78d8c61d863" +checksum = "74a57492267a5a8891866b6e48cdefa508b5f05931a5f8eaf004b9de15b1ffd6" dependencies = [ "anyhow", "cairo-felt", @@ -826,9 +827,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122c9055eb609a511178e3dce577de061819fd4c4c6b7452804557f76ca43bbf" +checksum = "6fdbb4bd95477123653b9200bd4e9dceae95a914f6fe85b2bed83b223e36fb5a" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -841,9 +842,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf049d9aea65c6e38da219a3700c72f78795d11449d9adcec28047ef8d63bd23" +checksum = "882cb178f1b79aabf70acce1d87b08d569d8a4b0ce8b1d8f538a02cdb36789db" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -856,9 +857,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e1d75e0830279ca1bd0189e3326720d6e081225f7d81ed060bbd22c6b37e980" +checksum = "4d80c9d29e6d3f4ab60e698ebe2de84dcf90570c3dd1cfa7b01bd5c42470331c" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -879,9 +880,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3c3be88c8562fbf93b0803c186e7282f6daad93576c07f61b04a591fde468f" +checksum = "3ac02c90be2630ae861db6af226090da92741020519768332dd2c07e24d94c75" dependencies = [ "assert_matches", "cairo-felt", @@ -900,9 +901,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38da6f98c6b16945c89d2ae351c82d636ed38d3e6eb02f7c8679e3e03a63988" +checksum = "d102b10989f9637b1c916dd950cbd1bd8bb1b6a7aaa1a3035390be0683b92d85" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -910,9 +911,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9ffa8b3b8c47138c36b1907cebb5047dfc4de29ec10ece5bd6d6853243ec50" +checksum = "a27921a2bf82d191d28afd570b913341080c8fc25c83bf870dbf1252570b1b41" dependencies = [ "anyhow", "cairo-felt", @@ -941,9 +942,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47c64ae2bb00173e3a88760128bf72de356fa80eb19fa47602479063648b4003" +checksum = "8623b076ef3569e4262da5da270a84658b1ff242fe0c9624fbe432e7a937d101" dependencies = [ "cairo-felt", "cairo-lang-casm", @@ -966,9 +967,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8262c426a57e1e5ec297db24278464841500613445e2cb1c43d5f71ad91ee8d6" +checksum = "4c62f5bd74e249636e7c48d8b95e6cc0ee991206d4a6cbe5c2624184a828e70b" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -992,9 +993,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c2d77976328ac79509b9c33e4380d15aeff7c8ee07fbaea6b41dd469084738" +checksum = "592e7e5f875d69428aae446e299d3c4618c7fb326adafc5d3a83bd8a5a916111" dependencies = [ "anyhow", "cairo-felt", @@ -1020,9 +1021,9 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf733a7cdc4166d0baf0ed8a98d9ada827daee6653b37d9326e334e53481c6d3" +checksum = "e6f98e8769412907ceb106c21c70907cc0c87ca0a2a44c82b6229a695a6f9b48" dependencies = [ "hashbrown 0.14.5", "indexmap 2.2.6", @@ -1037,7 +1038,7 @@ dependencies = [ [[package]] name = "cairo-native" version = "0.2.0" -source = "git+https://github.com/lambdaclass/cairo_native?rev=c64f5ee86391574d2ee63f9df65a0c2789942778#c64f5ee86391574d2ee63f9df65a0c2789942778" +source = "git+https://github.com/lambdaclass/cairo_native?rev=905d6959662edfec4829568f995206fcb8bf64d0#905d6959662edfec4829568f995206fcb8bf64d0" dependencies = [ "anyhow", "bumpalo", @@ -1076,7 +1077,7 @@ dependencies = [ "num-traits 0.2.19", "p256", "sec1", - "starknet-types-core 0.1.4", + "starknet-types-core 0.1.2", "stats_alloc", "tempfile", "thiserror", @@ -1087,7 +1088,7 @@ dependencies = [ [[package]] name = "cairo-native-runtime" version = "0.2.0" -source = "git+https://github.com/lambdaclass/cairo_native?rev=c64f5ee86391574d2ee63f9df65a0c2789942778#c64f5ee86391574d2ee63f9df65a0c2789942778" +source = "git+https://github.com/lambdaclass/cairo_native?rev=905d6959662edfec4829568f995206fcb8bf64d0#905d6959662edfec4829568f995206fcb8bf64d0" dependencies = [ "cairo-lang-runner", "cairo-lang-sierra-gas", @@ -1095,7 +1096,7 @@ dependencies = [ "libc", "starknet-crypto 0.6.2", "starknet-curve 0.4.2", - "starknet-types-core 0.1.4", + "starknet-types-core 0.1.2", ] [[package]] @@ -1132,9 +1133,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.101" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" [[package]] name = "cexpr" @@ -1161,7 +1162,7 @@ dependencies = [ "iana-time-zone", "num-traits 0.2.19", "serde", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1187,9 +1188,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.7" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ "clap_builder", "clap_derive", @@ -1197,9 +1198,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.7" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstream", "anstyle", @@ -1209,9 +1210,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.5" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2411,6 +2412,18 @@ dependencies = [ "sha3", ] +[[package]] +name = "lambdaworks-crypto" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fb5d4f22241504f7c7b8d2c3a7d7835d7c07117f10bff2a7d96a9ef6ef217c3" +dependencies = [ + "lambdaworks-math 0.7.0", + "serde", + "sha2", + "sha3", +] + [[package]] name = "lambdaworks-math" version = "0.6.0" @@ -2426,6 +2439,10 @@ name = "lambdaworks-math" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "358e172628e713b80a530a59654154bfc45783a6ed70ea284839800cebdf8f97" +dependencies = [ + "serde", + "serde_json", +] [[package]] name = "lazy_static" @@ -2455,7 +2472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2486,9 +2503,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "llvm-sys" -version = "180.0.0" +version = "181.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "778fa5fa02e32728e718f11eec147e6f134137399ab02fd2c13d32476337affa" +checksum = "890e59e3db86b787af9d9b53c6accc0193e9b698293dda178c0821dbc3fb6217" dependencies = [ "anyhow", "cc", @@ -2771,9 +2788,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -2888,7 +2905,7 @@ dependencies = [ "libc", "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3421,7 +3438,7 @@ dependencies = [ "log", "ring", "rustls-pki-types", - "rustls-webpki 0.102.4", + "rustls-webpki 0.102.5", "subtle", "zeroize", ] @@ -3453,9 +3470,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.4" +version = "0.102.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" dependencies = [ "ring", "rustls-pki-types", @@ -3627,9 +3644,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.118" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -4037,7 +4054,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1e16522c1c9aa7fc149a46816cd18aa12a5fc2b2b75a018089022db473a9237" dependencies = [ "bitvec", - "lambdaworks-crypto", + "lambdaworks-crypto 0.6.0", "lambdaworks-math 0.6.0", "lazy_static", "num-bigint", @@ -4048,10 +4065,11 @@ dependencies = [ [[package]] name = "starknet-types-core" -version = "0.1.4" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65799574816ba83cb04b21a3cb16f791b9882687cd9093415fd1b3821dbac29d" +checksum = "4098ac4ad57621cc7ec133b80fe72814d2cc4bee63ca8e7be4450ba6f42a07e8" dependencies = [ + "lambdaworks-crypto 0.7.0", "lambdaworks-math 0.7.0", "num-bigint", "num-integer", @@ -4649,7 +4667,7 @@ dependencies = [ "once_cell", "rustls 0.22.4", "rustls-pki-types", - "rustls-webpki 0.102.4", + "rustls-webpki 0.102.5", "serde", "serde_json", "url", @@ -4866,7 +4884,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4884,7 +4902,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -4904,18 +4922,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -4926,9 +4944,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -4938,9 +4956,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -4950,15 +4968,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -4968,9 +4986,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4980,9 +4998,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4992,9 +5010,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -5004,9 +5022,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -5068,18 +5086,18 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 092c701..3da1e48 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,5 +9,5 @@ resolver = "2" [workspace.dependencies] thiserror = "1.0.32" starknet_api = "=0.12.0-dev.1" -blockifier = { git = "https://github.com/lambdaclass/blockifier", rev = "e8c166195e601ef6c4951f135fdf660a9b795819" } +blockifier = { git = "https://github.com/lambdaclass/blockifier", rev = "73c8798e979c6e4b51f8b83efa469dba5eb4281b" } tracing = "0.1" diff --git a/replay/src/main.rs b/replay/src/main.rs index bc3a87e..08cbf90 100644 --- a/replay/src/main.rs +++ b/replay/src/main.rs @@ -316,7 +316,7 @@ fn show_execution_data( ); } - let execution_gas = execution_info.actual_fee; + let execution_gas = execution_info.execute_call_info.unwrap().execution.gas_consumed; let rpc_gas = rpc_receipt.actual_fee; debug!(?execution_gas, ?rpc_gas, "execution actual fee"); } diff --git a/rpc-state-reader/Cargo.toml b/rpc-state-reader/Cargo.toml index fae7868..80b0f58 100644 --- a/rpc-state-reader/Cargo.toml +++ b/rpc-state-reader/Cargo.toml @@ -11,9 +11,9 @@ serde_json = { version = "1.0", features = [ "raw_value", ] } starknet_api = { workspace = true } -cairo-lang-starknet = "=2.6.3" -cairo-lang-starknet-classes = "=2.6.3" -cairo-lang-utils = "=2.6.3" +cairo-lang-starknet = "=2.6.4" +cairo-lang-starknet-classes = "=2.6.4" +cairo-lang-utils = "=2.6.4" starknet = "0.7.0" thiserror = { workspace = true } flate2 = "1.0.25" diff --git a/rpc-state-reader/src/blockifier_state_reader.rs b/rpc-state-reader/src/blockifier_state_reader.rs index 0099fdc..9c0bef7 100644 --- a/rpc-state-reader/src/blockifier_state_reader.rs +++ b/rpc-state-reader/src/blockifier_state_reader.rs @@ -1,21 +1,16 @@ use blockifier::{ - blockifier::block::BlockInfo, - context::{BlockContext, ChainInfo, FeeTokenAddresses}, - execution::contract_class::{ClassInfo, ContractClass, ContractClassV0, ContractClassV0Inner}, - state::{ + blockifier::block::BlockInfo, bouncer::BouncerConfig, context::{BlockContext, ChainInfo, FeeTokenAddresses}, execution::contract_class::{ClassInfo, ContractClass, ContractClassV0, ContractClassV0Inner}, state::{ cached_state::CachedState, errors::StateError, state_api::{StateReader, StateResult}, - }, - transaction::{ + }, transaction::{ account_transaction::AccountTransaction, objects::{TransactionExecutionInfo, TransactionExecutionResult}, transactions::{ DeclareTransaction, DeployAccountTransaction, ExecutableTransaction, InvokeTransaction, L1HandlerTransaction, }, - }, - versioned_constants::VersionedConstants, + }, versioned_constants::VersionedConstants }; use cairo_vm::types::program::Program; use starknet::core::types::ContractClass as SNContractClass; @@ -177,10 +172,12 @@ pub fn execute_tx( }; // TODO: Check BlockContext::new_unchecked - let block_context = BlockContext::new_unchecked( - &block_info, - &chain_info, - &VersionedConstants::latest_constants_with_overrides(u32::MAX, usize::MAX), + let block_context = BlockContext::new( + block_info, + chain_info, + VersionedConstants::latest_constants_with_overrides(u32::MAX, usize::MAX), + BouncerConfig::empty(), + false ); // let block_context = BlockContext { // chain_id, @@ -302,10 +299,12 @@ pub fn execute_tx_configurable_with_state( fee_token_addresses: FeeTokenAddresses::default(), }; - let block_context = BlockContext::new_unchecked( - &block_info, - &chain_info, - &VersionedConstants::latest_constants_with_overrides(u32::MAX, usize::MAX), + let block_context = BlockContext::new( + block_info, + chain_info, + VersionedConstants::latest_constants_with_overrides(u32::MAX, usize::MAX), + BouncerConfig::empty(), + false ); // Get transaction before giving ownership of the reader From 5e909b7530205731febdce5e4859bf19c9e6f214 Mon Sep 17 00:00:00 2001 From: FrancoGiachetta Date: Fri, 5 Jul 2024 15:51:48 -0300 Subject: [PATCH 2/6] add comments --- replay/src/main.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/replay/src/main.rs b/replay/src/main.rs index 08cbf90..508d5a6 100644 --- a/replay/src/main.rs +++ b/replay/src/main.rs @@ -316,7 +316,11 @@ fn show_execution_data( ); } - let execution_gas = execution_info.execute_call_info.unwrap().execution.gas_consumed; + // if it is a declare tx then there's no execute call info + let execution_gas = match execution_info.execute_call_info { + Some(ci) => ci.execution.gas_consumed, + None => 0 + }; let rpc_gas = rpc_receipt.actual_fee; debug!(?execution_gas, ?rpc_gas, "execution actual fee"); } From 7c766127379956e69b8b21fcc864a32844e9f45d Mon Sep 17 00:00:00 2001 From: FrancoGiachetta Date: Fri, 5 Jul 2024 16:38:40 -0300 Subject: [PATCH 3/6] format --- Cargo.lock | 4 ++-- replay/src/main.rs | 2 +- rpc-state-reader/src/blockifier_state_reader.rs | 16 +++++++++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f1eba87..e82a164 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4376,9 +4376,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "ce6b6a2fb3a985e99cebfaefa9faa3024743da73304ca1c683a36429613d3d22" dependencies = [ "tinyvec_macros", ] diff --git a/replay/src/main.rs b/replay/src/main.rs index 508d5a6..a08319c 100644 --- a/replay/src/main.rs +++ b/replay/src/main.rs @@ -319,7 +319,7 @@ fn show_execution_data( // if it is a declare tx then there's no execute call info let execution_gas = match execution_info.execute_call_info { Some(ci) => ci.execution.gas_consumed, - None => 0 + None => 0, }; let rpc_gas = rpc_receipt.actual_fee; debug!(?execution_gas, ?rpc_gas, "execution actual fee"); diff --git a/rpc-state-reader/src/blockifier_state_reader.rs b/rpc-state-reader/src/blockifier_state_reader.rs index 9c0bef7..51645c2 100644 --- a/rpc-state-reader/src/blockifier_state_reader.rs +++ b/rpc-state-reader/src/blockifier_state_reader.rs @@ -1,16 +1,22 @@ use blockifier::{ - blockifier::block::BlockInfo, bouncer::BouncerConfig, context::{BlockContext, ChainInfo, FeeTokenAddresses}, execution::contract_class::{ClassInfo, ContractClass, ContractClassV0, ContractClassV0Inner}, state::{ + blockifier::block::BlockInfo, + bouncer::BouncerConfig, + context::{BlockContext, ChainInfo, FeeTokenAddresses}, + execution::contract_class::{ClassInfo, ContractClass, ContractClassV0, ContractClassV0Inner}, + state::{ cached_state::CachedState, errors::StateError, state_api::{StateReader, StateResult}, - }, transaction::{ + }, + transaction::{ account_transaction::AccountTransaction, objects::{TransactionExecutionInfo, TransactionExecutionResult}, transactions::{ DeclareTransaction, DeployAccountTransaction, ExecutableTransaction, InvokeTransaction, L1HandlerTransaction, }, - }, versioned_constants::VersionedConstants + }, + versioned_constants::VersionedConstants, }; use cairo_vm::types::program::Program; use starknet::core::types::ContractClass as SNContractClass; @@ -177,7 +183,7 @@ pub fn execute_tx( chain_info, VersionedConstants::latest_constants_with_overrides(u32::MAX, usize::MAX), BouncerConfig::empty(), - false + false, ); // let block_context = BlockContext { // chain_id, @@ -304,7 +310,7 @@ pub fn execute_tx_configurable_with_state( chain_info, VersionedConstants::latest_constants_with_overrides(u32::MAX, usize::MAX), BouncerConfig::empty(), - false + false, ); // Get transaction before giving ownership of the reader From 6387d93a810d59efddf6e5e21d8c697037f39493 Mon Sep 17 00:00:00 2001 From: FrancoGiachetta Date: Fri, 5 Jul 2024 16:48:31 -0300 Subject: [PATCH 4/6] update blockifier --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e82a164..ac20f57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -442,7 +442,7 @@ dependencies = [ [[package]] name = "blockifier" version = "0.7.0-dev.1" -source = "git+https://github.com/lambdaclass/blockifier?rev=73c8798e979c6e4b51f8b83efa469dba5eb4281b#73c8798e979c6e4b51f8b83efa469dba5eb4281b" +source = "git+https://github.com/lambdaclass/blockifier?branch=native2.6.3-update#73c8798e979c6e4b51f8b83efa469dba5eb4281b" dependencies = [ "anyhow", "ark-ec", diff --git a/Cargo.toml b/Cargo.toml index 3da1e48..64c427c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,5 +9,5 @@ resolver = "2" [workspace.dependencies] thiserror = "1.0.32" starknet_api = "=0.12.0-dev.1" -blockifier = { git = "https://github.com/lambdaclass/blockifier", rev = "73c8798e979c6e4b51f8b83efa469dba5eb4281b" } +blockifier = { git = "https://github.com/lambdaclass/blockifier", branch = "native2.6.3-update" } tracing = "0.1" From 2d03f1d8cf3bc7e5402a11e3ede7fcc69ca69446 Mon Sep 17 00:00:00 2001 From: FrancoGiachetta Date: Fri, 5 Jul 2024 17:40:05 -0300 Subject: [PATCH 5/6] update blockifier --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ac20f57..e82a164 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -442,7 +442,7 @@ dependencies = [ [[package]] name = "blockifier" version = "0.7.0-dev.1" -source = "git+https://github.com/lambdaclass/blockifier?branch=native2.6.3-update#73c8798e979c6e4b51f8b83efa469dba5eb4281b" +source = "git+https://github.com/lambdaclass/blockifier?rev=73c8798e979c6e4b51f8b83efa469dba5eb4281b#73c8798e979c6e4b51f8b83efa469dba5eb4281b" dependencies = [ "anyhow", "ark-ec", diff --git a/Cargo.toml b/Cargo.toml index 64c427c..3da1e48 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,5 +9,5 @@ resolver = "2" [workspace.dependencies] thiserror = "1.0.32" starknet_api = "=0.12.0-dev.1" -blockifier = { git = "https://github.com/lambdaclass/blockifier", branch = "native2.6.3-update" } +blockifier = { git = "https://github.com/lambdaclass/blockifier", rev = "73c8798e979c6e4b51f8b83efa469dba5eb4281b" } tracing = "0.1" From 94d56401d5c1e18993175b27eb7b79752a3e956d Mon Sep 17 00:00:00 2001 From: FrancoGiachetta Date: Mon, 8 Jul 2024 09:39:34 -0300 Subject: [PATCH 6/6] update to fixed blokifier --- Cargo.lock | 100 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e82a164..bb932e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -276,13 +276,13 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -293,7 +293,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -387,7 +387,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.68", + "syn 2.0.69", "which", ] @@ -442,7 +442,7 @@ dependencies = [ [[package]] name = "blockifier" version = "0.7.0-dev.1" -source = "git+https://github.com/lambdaclass/blockifier?rev=73c8798e979c6e4b51f8b83efa469dba5eb4281b#73c8798e979c6e4b51f8b83efa469dba5eb4281b" +source = "git+https://github.com/lambdaclass/blockifier?rev=cca77ec508f715c46f2170ac8245fb89084e152c#cca77ec508f715c46f2170ac8245fb89084e152c" dependencies = [ "anyhow", "ark-ec", @@ -726,7 +726,7 @@ checksum = "0c90d812ec983c5a8e3173aca3fc55036b9739201c89f30271ee14a4c1189379" dependencies = [ "cairo-lang-debug", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -1133,9 +1133,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.104" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "066fce287b1d4eafef758e89e09d724a24808a9196fe9756b8ca90e86d0719a2" [[package]] name = "cexpr" @@ -1217,7 +1217,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -1427,7 +1427,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -1449,7 +1449,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178" dependencies = [ "darling_core 0.20.9", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -1528,7 +1528,7 @@ dependencies = [ "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -1538,7 +1538,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -1551,7 +1551,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -1634,7 +1634,7 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -1704,7 +1704,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -1917,7 +1917,7 @@ checksum = "553630feadf7b76442b0849fd25fdf89b860d933623aec9693fed19af0400c78" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -2582,7 +2582,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.68", + "syn 2.0.69", "tblgen-alt", "unindent", ] @@ -2803,9 +2803,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "ordered-float" @@ -2984,7 +2984,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -3078,7 +3078,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -3431,11 +3431,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki 0.102.5", @@ -3560,7 +3561,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -3613,22 +3614,22 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -3639,7 +3640,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -3710,7 +3711,7 @@ dependencies = [ "darling 0.20.9", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -3965,7 +3966,7 @@ checksum = "bbc159a1934c7be9761c237333a57febe060ace2bc9e3b337a59a37af206d19f" dependencies = [ "starknet-curve 0.4.2", "starknet-ff", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -4008,7 +4009,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95d549d3078bdbe775d0deaa8ddb57a19942989ce7c1f2dfd60beeb322bb4945" dependencies = [ "starknet-core 0.10.0", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -4174,9 +4175,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.68" +version = "2.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" dependencies = [ "proc-macro2", "quote", @@ -4269,7 +4270,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -4280,7 +4281,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", "test-case-core", ] @@ -4301,7 +4302,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -4414,7 +4415,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -4510,7 +4511,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -4657,17 +4658,16 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" dependencies = [ "base64 0.22.1", "flate2", "log", "once_cell", - "rustls 0.22.4", + "rustls 0.23.10", "rustls-pki-types", - "rustls-webpki 0.102.5", "serde", "serde_json", "url", @@ -4765,7 +4765,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", "wasm-bindgen-shared", ] @@ -4799,7 +4799,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5101,7 +5101,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] [[package]] @@ -5121,5 +5121,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.69", ] diff --git a/Cargo.toml b/Cargo.toml index 3da1e48..040beb6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,5 +9,5 @@ resolver = "2" [workspace.dependencies] thiserror = "1.0.32" starknet_api = "=0.12.0-dev.1" -blockifier = { git = "https://github.com/lambdaclass/blockifier", rev = "73c8798e979c6e4b51f8b83efa469dba5eb4281b" } +blockifier = { git = "https://github.com/lambdaclass/blockifier", rev = "cca77ec508f715c46f2170ac8245fb89084e152c" } tracing = "0.1"