diff --git a/Cargo.lock b/Cargo.lock index 6e3a0338119..25fac22dbd5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3428,9 +3428,9 @@ checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" [[package]] name = "cairo-lang-casm" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca20144595b4524a219875db6511488acefa556648d88ab957083bee5b65efa6" +checksum = "88bf35a939eaed69b8a71405c5d56fa52c3b1c76701b8c1056fe22b3e2569c7d" dependencies = [ "cairo-lang-utils", "indoc 2.0.5", @@ -3443,9 +3443,9 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d805fc6a019554765917eebc401d3eec3f521ca287f5f629531d353a5a9d9ced" +checksum = "c13c2341fb2272999f6152b0fc2238148fe93c745183a07acba031b27eeb0b66" dependencies = [ "anyhow", "cairo-lang-defs", @@ -3469,19 +3469,20 @@ dependencies = [ [[package]] name = "cairo-lang-debug" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dc52a0a23c8f6ac1c0143337a49d340d0e8e06b8e659c4df86f89d4ae44865" +checksum = "17cf782d64a29c4acb1eb2759c39783d5e92c397d5ae3775754edae5d2c665ee" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a70c35fb1c70d0f35fe1f0a3dc8dbb141e7e5ea66981a2ec8b1f22181d5b8ac9" +checksum = "80a146574d443e7fba848c069d7d84879c4635df5811963a18bf042df3e34e61" dependencies = [ + "bincode 1.3.3", "cairo-lang-debug", "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -3490,14 +3491,16 @@ dependencies = [ "cairo-lang-utils", "itertools 0.14.0", "rust-analyzer-salsa", + "serde", "smol_str", + "typetag", ] [[package]] name = "cairo-lang-diagnostics" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942f5566e6fe15a81a3e28324fa86f6a8f71a30ec8029da03924b057bb40ce4d" +checksum = "cb704187b1543aa4a2e0030d13ae6e0ad63712e5362cac3ded3237623a2b1b32" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -3507,9 +3510,9 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0839865e47b5207cd60602ccfaac263bdf7e789fa70ff5bca6095a0a64be8d" +checksum = "a5a2e6145241a4812820948278a86e11c25adc30e9a19b2e24b2517be19eedac" dependencies = [ "cairo-lang-utils", "good_lp", @@ -3517,9 +3520,9 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b92dfb70e74886c79bae62762525e63ffef0fe9d554b9a6e4c0c8a797c5c2e8" +checksum = "3c903cdcae48aa02c0ed41e1fd54b3231da51f1edf9538327ed155463594b8be" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -3533,9 +3536,9 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "087165d70104c91b3d32b7cdaecfa1dd77021cc22e37edd9fab298c940aff108" +checksum = "a943f0818cfc091c3302acd92053ff2a642004d32757c3b4f94c5aa18e184ac0" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -3553,10 +3556,11 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "750ba5e07fc5007ea1e060980336d3f23333d42d30757a8565d42b65fc7dc443" +checksum = "7b86cd38af57c36b2a72a2483d04d8b17ea2f9a554fd45b9d83375773f948818" dependencies = [ + "assert_matches", "bincode 1.3.3", "cairo-lang-debug", "cairo-lang-defs", @@ -3575,14 +3579,13 @@ dependencies = [ "num-traits", "rust-analyzer-salsa", "serde", - "smol_str", ] [[package]] name = "cairo-lang-parser" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580b357d88fe2a3b16262197613a313e20a39c6c2295200b490964c2cb53d40" +checksum = "f64f0a5ca9ac54975cdec98fe8491d9b62922b7cb048e6ded00188383b841b25" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -3601,9 +3604,9 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1811cb86e54c73b0b282287776fd82f4018072457a260914a1bf03b64d22fa4" +checksum = "6230c6d37e5e8361900709112e56b42e48478806b829a086727ef59b2f7f3310" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -3626,9 +3629,9 @@ checksum = "123ac0ecadf31bacae77436d72b88fa9caef2b8e92c89ce63a125ae911a12fae" [[package]] name = "cairo-lang-proc-macros" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74578b4f0f919071d02326b9dadd80e8c5bb9a69e2b4ff062ccdb017951a88" +checksum = "b1e4872352761cf6d7f47eeb1626e3b1d84a514017fb4251173148d8c04f36d5" dependencies = [ "cairo-lang-debug", "quote", @@ -3637,9 +3640,9 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7154735bbb4c6c8cfaf7fc611231f35f08e5b584139c6a676def1430cc14c7" +checksum = "2327b8c070f9e50ac85a410f03c6aaf6a0dffee5ba8299d6af4bf2344587ac42" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -3650,9 +3653,9 @@ dependencies = [ [[package]] name = "cairo-lang-runnable-utils" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5a96853a0556740dbb486cbbc7784c0a775cfba26650b9772a10535c6a882ea" +checksum = "775b064b0265e8408565b1ec9d360116015acf35753f02db255cbb13ad30670e" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -3668,9 +3671,9 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5628ef5cdd431e96a736127ba479ceca1b1cea798682d47278e1e3e377eaaed" +checksum = "e7166250692bda4b8b31f0480b8ba7fe75793b15bd4f0b6e5b5fe5d6dde01da8" dependencies = [ "ark-ff 0.5.0", "ark-secp256k1 0.5.0", @@ -3698,9 +3701,9 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f142b9100cc6406b0bcbd01fb0711a9132c4b7f5fc8735654c3d6badc619e9b0" +checksum = "f53a1ea47d1a0295179881d5578fc2b2c8cd5d2ac99bd81958c423d54960bb84" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -3725,9 +3728,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a4705aa4648321a72f61026f64549d93b97d05334d6942caee68d5b77a12fc7" +checksum = "a48fe249ba77fb39363b1b40c81556c8d272083508b4618fb65b964559aca0ee" dependencies = [ "anyhow", "cairo-lang-utils", @@ -3752,9 +3755,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22583651e32e4bd7bd7f28cc296843f773dc558da8c445ecc4a1346300331d1" +checksum = "fad6cbf5cc904f4309179793fc3757c1db9615e71c1b78eff601d2e22206d1c6" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -3768,9 +3771,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2fcec423871e47d8ac0429cd82f5f412fa258c423e587a3a342286cfcdafaab" +checksum = "704ec6a8cb1b38f78571d5561519e87672ed5008a018a422842fa2a122ca3c34" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -3784,9 +3787,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de6863813f89afccbb09c3f0d38cb3f13a5f08760e739748e8cbdd900a0a901" +checksum = "2e011122028a59557ff075b22f550f7d0267b493f3db3dbefc281ff6795d108c" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -3808,9 +3811,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7fd03b3dd28fcc4f22531332f49960bab91b2625fa513063899edebc13e4ef6" +checksum = "6a43885fd8e806f5c50a80473798faad1a9a919f474e469d3027aece4f8b2002" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -3829,9 +3832,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3548bcb7ae9f6d57af33460050b8ce0fb93f78b5b347df9e181b6daa19369de5" +checksum = "860006ddce78cae65babf37ff279c31358336ae76717991837d7e0868561878c" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -3839,9 +3842,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9fa502787b9024015622d9f617a89504af6f50729fee8fb7a0be1f03b679f3b" +checksum = "4ba6eb0a421d3411f4948e002d3dd81ab134044465bda3131f2718f56afda409" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -3865,13 +3868,14 @@ dependencies = [ "smol_str", "starknet-types-core", "thiserror 2.0.12", + "typetag", ] [[package]] name = "cairo-lang-starknet-classes" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ab575002a5ccdcfe58936745f52ef40a9c1b5444983a286e7620b385743d171" +checksum = "2cf81db2c36c1e3fe3bbf64ebc5c237f748e9f41bdd42a6ed3e03e00086d768c" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -3892,9 +3896,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972ffca1d3676fe22ea423e9240602e1c42ea166f7e55291689e4361faef2d66" +checksum = "f36620fd45292fd0276bd581e774222fbd06e13aa8a4bf820a4be8ad3bcec100" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -3910,9 +3914,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cf462ebea64b01a8e8879caf58941d84487713342f55fa8540864d69ac1ed82" +checksum = "0e5e3c6be0b159dad1239fa83562087448aeb1d44b0ead059ea6ab73728909a8" dependencies = [ "genco", "xshell", @@ -3920,9 +3924,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52698c6ee88e4fcbdb8d00b30ad7ef897f54b8ae4859e8247576db502b79ea49" +checksum = "eb622d636da63a5cc8138dba941d9eb1918d06e297bdb5a76dc69fffdf3581d9" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -3947,9 +3951,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5753bfa814268a383424da937c4bc4ac08c302181f947deaa0871e57b7324b17" +checksum = "4c65df2eee1678a29b4b9dcff5c10a70b44e38d445ba2522025b1b6b7177b61f" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -3960,9 +3964,9 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.12.0-dev.0" +version = "2.12.0-dev.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cec425aef45ab28a7ee880481ad9ac22daeed811f325e9e135d71412338dacb" +checksum = "5f043065d60a8a2510bfacb6c91767298fed50ed9abbd69ff7698322b7cb1e65" dependencies = [ "hashbrown 0.15.2", "indexmap 2.9.0", @@ -3977,9 +3981,9 @@ dependencies = [ [[package]] name = "cairo-native" -version = "0.5.0-rc.3" +version = "0.5.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44298144b631409ea70f17013fa6a01ce5aad3a901ae34b7881a965174162963" +checksum = "6629dd8614a0745e588d71542d570f0c74bf74a704382c806822fbc43708d4d9" dependencies = [ "anyhow", "aquamarine", @@ -3997,6 +4001,7 @@ dependencies = [ "cairo-lang-sierra-ap-change", "cairo-lang-sierra-gas", "cairo-lang-sierra-generator", + "cairo-lang-sierra-to-casm", "cairo-lang-starknet", "cairo-lang-starknet-classes", "cairo-lang-test-plugin", @@ -5305,6 +5310,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "erased-serde" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e004d887f51fcb9fef17317a2f3525c887d8aa3f4f50fed920816a688284a5b7" +dependencies = [ + "serde", + "typeid", +] + [[package]] name = "errno" version = "0.3.10" @@ -7199,6 +7214,15 @@ version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" +[[package]] +name = "inventory" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab08d7cd2c5897f2c949e5383ea7c7db03fb19130ffcfbf7eda795137ae3cb83" +dependencies = [ + "rustversion", +] + [[package]] name = "io-lifetimes" version = "1.0.11" @@ -13031,12 +13055,42 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" +[[package]] +name = "typeid" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" + [[package]] name = "typenum" version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +[[package]] +name = "typetag" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f22b40dd7bfe8c14230cf9702081366421890435b2d625fa92b4acc4c3de6f" +dependencies = [ + "erased-serde", + "inventory", + "once_cell", + "serde", + "typetag-impl", +] + +[[package]] +name = "typetag-impl" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35f5380909ffc31b4de4f4bdf96b877175a016aa2ca98cee39fcfd8c4d53d952" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.100", +] + [[package]] name = "ucd-trie" version = "0.1.7" diff --git a/Cargo.toml b/Cargo.toml index 3d41a522cdf..84ff644556b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -158,13 +158,13 @@ bytes = "1" c-kzg = "1.0.3" cached = "0.44.0" cairo-felt = "0.9.1" -cairo-lang-casm = "2.12.0-dev.0" -cairo-lang-runner = "2.12.0-dev.0" -cairo-lang-sierra = "2.12.0-dev.0" -cairo-lang-sierra-to-casm = "2.12.0-dev.0" -cairo-lang-starknet-classes = "2.12.0-dev.0" -cairo-lang-utils = "2.12.0-dev.0" -cairo-native = "0.5.0-rc.3" +cairo-lang-casm = "2.12.0-dev.1" +cairo-lang-runner = "2.12.0-dev.1" +cairo-lang-sierra = "2.12.0-dev.1" +cairo-lang-sierra-to-casm = "2.12.0-dev.1" +cairo-lang-starknet-classes = "2.12.0-dev.1" +cairo-lang-utils = "2.12.0-dev.1" +cairo-native = "0.5.0-rc.5" cairo-vm = "2.0.1" camelpaste = "0.1.0" chrono = "0.4.26" diff --git a/crates/apollo_mempool/src/mempool.rs b/crates/apollo_mempool/src/mempool.rs index e315275f791..eacfa50ec86 100644 --- a/crates/apollo_mempool/src/mempool.rs +++ b/crates/apollo_mempool/src/mempool.rs @@ -53,7 +53,7 @@ struct CommitHistory { impl CommitHistory { fn new(capacity: usize) -> Self { - CommitHistory { commits: std::iter::repeat(AddressToNonce::new()).take(capacity).collect() } + CommitHistory { commits: std::iter::repeat_n(AddressToNonce::new(), capacity).collect() } } fn push(&mut self, commit: AddressToNonce) -> AddressToNonce { diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 52e88dc40ec..689a4291481 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.85" +channel = "1.86" components = ["rustc-dev"] profile = "default" targets = ["x86_64-unknown-linux-gnu"]