From 5736bfc244f7701a71a36071956259db6a1a9821 Mon Sep 17 00:00:00 2001 From: Jason Park Date: Thu, 16 Jan 2025 14:47:48 +0000 Subject: [PATCH 1/4] chore: fix dependency issues `cairo-bootloader` was updated: https://github.com/zksecurity/cairo-bootloader/pull/1 --- src/bootloader.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bootloader.rs b/src/bootloader.rs index 42c2eb9..86738a8 100644 --- a/src/bootloader.rs +++ b/src/bootloader.rs @@ -209,6 +209,7 @@ fn cairo_run_bootloader_in_proof_mode( supported_cairo_verifier_program_hashes: verifier_hashes, }, packed_outputs: vec![PackedOutput::Plain(vec![]); n_tasks], + ignore_fact_topologies: false, }; let mut exec_scopes = ExecutionScopes::new(); From bcc2aea36ee439ff6b49f778f9652116b25e098c Mon Sep 17 00:00:00 2001 From: Jason Park Date: Thu, 16 Jan 2025 14:48:25 +0000 Subject: [PATCH 2/4] feat: add `ignore_fact_topologies` arg --- src/args.rs | 6 ++++++ src/bootloader.rs | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/args.rs b/src/args.rs index a33f3c7..9e4389a 100644 --- a/src/args.rs +++ b/src/args.rs @@ -90,6 +90,12 @@ pub struct ProveBootloaderArgs { #[clap(flatten)] pub prover_config: ProverConfig, + + #[clap( + long = "ignore_fact_topologies", + help = "Option to ignore fact topologies, which will result in task outputs being written only to public memory page 0" + )] + pub ignore_fact_topologies: bool, } #[derive(Args, Debug)] diff --git a/src/bootloader.rs b/src/bootloader.rs index 86738a8..2b1c638 100644 --- a/src/bootloader.rs +++ b/src/bootloader.rs @@ -112,6 +112,7 @@ pub fn run_bootloader( tasks, prove_bootloader_args.layout.to_cairo_vm_layout(), prove_bootloader_args.fact_topologies_output.clone(), + prove_bootloader_args.ignore_fact_topologies, )?; let relocated_trace = runner @@ -175,6 +176,7 @@ fn cairo_run_bootloader_in_proof_mode( tasks: Vec, layout: LayoutName, fact_topologies_path: PathBuf, + ignore_fact_topologies: bool, ) -> Result { let mut hint_processor = BootloaderHintProcessor::new(); @@ -209,7 +211,7 @@ fn cairo_run_bootloader_in_proof_mode( supported_cairo_verifier_program_hashes: verifier_hashes, }, packed_outputs: vec![PackedOutput::Plain(vec![]); n_tasks], - ignore_fact_topologies: false, + ignore_fact_topologies, }; let mut exec_scopes = ExecutionScopes::new(); From 483e752d4669ee5960655ec6c5236e5fb11ef8f2 Mon Sep 17 00:00:00 2001 From: Jason Park Date: Thu, 16 Jan 2025 15:39:54 +0000 Subject: [PATCH 3/4] chore: update dependencies --- Cargo.lock | 285 ++++++++++++++++++++++++++++------------------------- Cargo.toml | 2 +- 2 files changed, 154 insertions(+), 133 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 167c5a0..88b39c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,11 +121,12 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.6" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", + "once_cell", "windows-sys 0.59.0", ] @@ -238,7 +239,7 @@ checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -271,13 +272,13 @@ dependencies = [ [[package]] name = "auto_impl" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" +checksum = "e12882f59de5360c748c4cbf569a042d5fb0eb515f7bea9c1f470b47f6ffbd73" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -379,9 +380,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" [[package]] name = "bitvec" @@ -485,7 +486,7 @@ dependencies = [ [[package]] name = "cairo-bootloader" version = "0.1.0" -source = "git+https://github.com/zksecurity/cairo-bootloader#b43353d7202f1d39f91f8f154b243967bb1d69bb" +source = "git+https://github.com/zksecurity/cairo-bootloader?rev=ca1435a6cf52c7cea6d98e1c4edecff8424b4bae#ca1435a6cf52c7cea6d98e1c4edecff8424b4bae" dependencies = [ "cairo-vm 2.0.0-rc2", "num-traits", @@ -493,7 +494,7 @@ dependencies = [ "serde_json", "starknet-crypto 0.6.2", "starknet-types-core 0.1.7", - "thiserror", + "thiserror 1.0.69", "thiserror-no-std", ] @@ -564,7 +565,7 @@ dependencies = [ "serde_json", "sha2", "sha3", - "starknet-crypto 0.7.3", + "starknet-crypto 0.7.4", "starknet-types-core 0.1.7", "thiserror-no-std", "wasm-bindgen", @@ -600,14 +601,14 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "cc" -version = "1.2.7" +version = "1.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" +checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b" dependencies = [ "jobserver", "libc", @@ -660,9 +661,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.24" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9560b07a799281c7e0958b9296854d6fafd4c5f31444a7e5bb1ad6dde5ccf1bd" +checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783" dependencies = [ "clap_builder", "clap_derive", @@ -670,9 +671,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.24" +version = "4.5.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874e0dd3eb68bf99058751ac9712f622e61e6f393a94f7128fa26e3f02f5c7cd" +checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121" dependencies = [ "anstream", "anstyle", @@ -689,7 +690,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -720,7 +721,7 @@ dependencies = [ "k256", "serde", "sha2", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -736,7 +737,7 @@ dependencies = [ "pbkdf2 0.12.2", "rand", "sha2", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -756,7 +757,7 @@ dependencies = [ "serde_derive", "sha2", "sha3", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -907,7 +908,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -918,14 +919,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] name = "data-encoding" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f" [[package]] name = "der" @@ -975,7 +976,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -1046,7 +1047,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -1170,7 +1171,7 @@ dependencies = [ "serde_json", "sha2", "sha3", - "thiserror", + "thiserror 1.0.69", "uuid 0.8.2", ] @@ -1187,7 +1188,7 @@ dependencies = [ "serde", "serde_json", "sha3", - "thiserror", + "thiserror 1.0.69", "uint", ] @@ -1266,7 +1267,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1288,7 +1289,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "syn 2.0.95", + "syn 2.0.96", "toml", "walkdir", ] @@ -1306,7 +1307,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -1332,9 +1333,9 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.95", + "syn 2.0.96", "tempfile", - "thiserror", + "thiserror 1.0.69", "tiny-keccak", "unicode-xid", ] @@ -1352,7 +1353,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -1376,7 +1377,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", "tracing-futures", @@ -1408,7 +1409,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-tungstenite", "tracing", @@ -1435,7 +1436,7 @@ dependencies = [ "ethers-core", "rand", "sha2", - "thiserror", + "thiserror 1.0.69", "tracing", ] @@ -1463,7 +1464,7 @@ dependencies = [ "serde_json", "solang-parser", "svm-rs", - "thiserror", + "thiserror 1.0.69", "tiny-keccak", "tokio", "tracing", @@ -1664,7 +1665,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -2032,7 +2033,7 @@ dependencies = [ "http 1.2.0", "hyper 1.5.2", "hyper-util", - "rustls 0.23.20", + "rustls 0.23.21", "rustls-pki-types", "tokio", "tokio-rustls 0.26.1", @@ -2212,7 +2213,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -2277,7 +2278,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -2474,7 +2475,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c6c4d0ddd1fcd235be5196b1bcc404f89ad3e911f4c190fa01459e05dbf40f8" dependencies = [ - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2518,7 +2519,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "libc", "redox_syscall", ] @@ -2547,9 +2548,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "lru" @@ -2599,9 +2600,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ "adler2", ] @@ -2747,7 +2748,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -2796,7 +2797,7 @@ version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "cfg-if", "foreign-types", "libc", @@ -2813,7 +2814,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -3005,7 +3006,7 @@ dependencies = [ "phf_shared 0.11.3", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -3043,7 +3044,7 @@ checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -3127,12 +3128,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.27" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "483f8c21f64f3ea09fe0f30f5d48c3e8eefe5dac9129f0075f76593b4c1da705" +checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac" dependencies = [ "proc-macro2", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -3160,9 +3161,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] @@ -3173,7 +3174,7 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "lazy_static", "num-traits", "rand", @@ -3263,7 +3264,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", ] [[package]] @@ -3274,7 +3275,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3495,7 +3496,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.95", + "syn 2.0.96", "unicode-ident", ] @@ -3536,7 +3537,7 @@ version = "0.38.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "errno", "libc", "linux-raw-sys", @@ -3557,9 +3558,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.20" +version = "0.23.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" +checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" dependencies = [ "once_cell", "rustls-pki-types", @@ -3664,7 +3665,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -3724,7 +3725,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation", "core-foundation-sys", "libc", @@ -3779,7 +3780,7 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -3868,7 +3869,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -3880,7 +3881,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -3955,13 +3956,13 @@ dependencies = [ [[package]] name = "simple_asn1" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" dependencies = [ "num-bigint", "num-traits", - "thiserror", + "thiserror 2.0.11", "time", ] @@ -4012,7 +4013,7 @@ dependencies = [ "lalrpop", "lalrpop-util", "phf", - "thiserror", + "thiserror 1.0.69", "unicode-xid", ] @@ -4058,7 +4059,7 @@ dependencies = [ "serde", "serde_json", "serde_with 3.12.0", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -4075,7 +4076,7 @@ dependencies = [ "serde", "serde_json", "serde_with 3.12.0", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -4094,7 +4095,7 @@ dependencies = [ "serde_json_pythonic", "serde_with 2.3.3", "sha3", - "starknet-crypto 0.7.3", + "starknet-crypto 0.7.4", "starknet-types-core 0.1.7", ] @@ -4120,9 +4121,9 @@ dependencies = [ [[package]] name = "starknet-crypto" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded22ccf4cb9e572ce3f77de6066af53560cd2520d508876c83bb1e6b29d5cbc" +checksum = "039a3bad70806b494c9e6b21c5238a6c8a373d66a26071859deb0ccca6f93634" dependencies = [ "crypto-bigint", "hex", @@ -4145,7 +4146,7 @@ checksum = "bbc159a1934c7be9761c237333a57febe060ace2bc9e3b337a59a37af206d19f" dependencies = [ "starknet-curve 0.4.2", "starknet-ff", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -4223,7 +4224,7 @@ dependencies = [ "cairo-bootloader", "cairo-felt", "cairo-vm 2.0.0-rc2", - "clap 4.5.24", + "clap 4.5.26", "flate2", "itertools 0.13.0", "num-bigint", @@ -4236,7 +4237,7 @@ dependencies = [ "serde_json", "sha256", "stark_evm_adapter 0.1.5 (git+https://github.com/zksecurity/stark-evm-adapter.git?rev=e044116e3cf4e3cbca11cce7b9e508a0f3e6870b)", - "starknet-crypto 0.7.3", + "starknet-crypto 0.7.4", "stone-prover-sdk", "swiftness", "swiftness_air", @@ -4245,8 +4246,8 @@ dependencies = [ "swiftness_stark", "tar", "tempfile", - "thiserror", - "uuid 1.11.0", + "thiserror 1.0.69", + "uuid 1.12.0", ] [[package]] @@ -4260,7 +4261,7 @@ dependencies = [ "serde_json", "stark_evm_adapter 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -4308,7 +4309,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -4332,7 +4333,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror", + "thiserror 1.0.69", "url", "zip", ] @@ -4344,20 +4345,20 @@ source = "git+https://github.com/zksecurity/integrity-calldata-generator?rev=6f2 dependencies = [ "anyhow", "cairo-felt", - "clap 4.5.24", + "clap 4.5.26", "itertools 0.13.0", "num-bigint", "num-traits", "serde", "serde_json", - "starknet-crypto 0.7.3", + "starknet-crypto 0.7.4", "swiftness_air", "swiftness_commitment", "swiftness_fri", "swiftness_pow", "swiftness_proof_parser", "swiftness_stark", - "thiserror", + "thiserror 1.0.69", "thiserror-no-std", ] @@ -4370,11 +4371,11 @@ dependencies = [ "serde", "serde_with 3.12.0", "starknet-core", - "starknet-crypto 0.7.3", + "starknet-crypto 0.7.4", "starknet-types-core 0.1.7", "swiftness_commitment", "swiftness_transcript", - "thiserror", + "thiserror 1.0.69", "thiserror-no-std", ] @@ -4389,10 +4390,10 @@ dependencies = [ "serde_with 3.12.0", "sha3", "starknet-core", - "starknet-crypto 0.7.3", + "starknet-crypto 0.7.4", "starknet-types-core 0.1.7", "swiftness_transcript", - "thiserror", + "thiserror 1.0.69", "thiserror-no-std", ] @@ -4406,10 +4407,10 @@ dependencies = [ "serde_with 3.12.0", "sha3", "starknet-core", - "starknet-crypto 0.7.3", + "starknet-crypto 0.7.4", "swiftness_commitment", "swiftness_transcript", - "thiserror", + "thiserror 1.0.69", "thiserror-no-std", ] @@ -4421,11 +4422,11 @@ dependencies = [ "blake2", "serde", "sha3", - "starknet-crypto 0.7.3", + "starknet-crypto 0.7.4", "starknet-types-core 0.1.7", "swiftness_commitment", "swiftness_transcript", - "thiserror", + "thiserror 1.0.69", "thiserror-no-std", ] @@ -4435,14 +4436,14 @@ version = "0.1.2" source = "git+https://github.com/zksecurity/integrity-calldata-generator?rev=6f2dd268274e40e5ea75e2f17aff6b8e53f8f499#6f2dd268274e40e5ea75e2f17aff6b8e53f8f499" dependencies = [ "anyhow", - "clap 4.5.24", + "clap 4.5.26", "num-bigint", "regex", "serde", "serde_json", - "starknet-crypto 0.7.3", + "starknet-crypto 0.7.4", "starknet-types-core 0.1.7", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4453,13 +4454,13 @@ dependencies = [ "serde", "serde_with 3.12.0", "starknet-core", - "starknet-crypto 0.7.3", + "starknet-crypto 0.7.4", "swiftness_air", "swiftness_commitment", "swiftness_fri", "swiftness_pow", "swiftness_transcript", - "thiserror", + "thiserror 1.0.69", "thiserror-no-std", ] @@ -4468,7 +4469,7 @@ name = "swiftness_transcript" version = "0.1.2" source = "git+https://github.com/zksecurity/integrity-calldata-generator?rev=6f2dd268274e40e5ea75e2f17aff6b8e53f8f499#6f2dd268274e40e5ea75e2f17aff6b8e53f8f499" dependencies = [ - "starknet-crypto 0.7.3", + "starknet-crypto 0.7.4", ] [[package]] @@ -4484,9 +4485,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.95" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -4516,7 +4517,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -4536,7 +4537,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation", "system-configuration-sys 0.6.0", ] @@ -4630,7 +4631,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +dependencies = [ + "thiserror-impl 2.0.11", ] [[package]] @@ -4641,7 +4651,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", ] [[package]] @@ -4731,9 +4752,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -4749,13 +4770,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -4784,7 +4805,7 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ - "rustls 0.23.20", + "rustls 0.23.21", "tokio", ] @@ -4896,7 +4917,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -4939,7 +4960,7 @@ dependencies = [ "rand", "rustls 0.21.12", "sha1", - "thiserror", + "thiserror 1.0.69", "url", "utf-8", ] @@ -5039,9 +5060,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +checksum = "744018581f9a3454a9e15beb8a33b017183f1e7c0cd170232a2d1453b23a51c4" [[package]] name = "vcpkg" @@ -5116,7 +5137,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", "wasm-bindgen-shared", ] @@ -5150,7 +5171,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5397,9 +5418,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.22" +version = "0.6.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39281189af81c07ec09db316b302a3e67bf9bd7cbf6c820b50e35fee9c2fa980" +checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a" dependencies = [ "memchr", ] @@ -5439,7 +5460,7 @@ dependencies = [ "pharos", "rustc_version", "send_wrapper 0.6.0", - "thiserror", + "thiserror 1.0.69", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -5491,7 +5512,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", "synstructure", ] @@ -5513,7 +5534,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -5533,7 +5554,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", "synstructure", ] @@ -5554,7 +5575,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] @@ -5576,7 +5597,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.96", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 514db5d..002a477 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ anyhow = "1.0.86" bincode = { version = "2.0.0-rc.3", default-features = false, features = [ "serde", ] } -cairo-bootloader = { git = "https://github.com/zksecurity/cairo-bootloader" } +cairo-bootloader = { git = "https://github.com/zksecurity/cairo-bootloader", rev = "ca1435a6cf52c7cea6d98e1c4edecff8424b4bae" } cairo-felt = "0.9.1" cairo-vm = { git = "https://github.com/zksecurity/cairo-vm", features = [ "extensive_hints", From b3a3aa0fbe35e8bed0c795b2ea540337936aa739 Mon Sep 17 00:00:00 2001 From: Jason Park Date: Thu, 16 Jan 2025 15:46:07 +0000 Subject: [PATCH 4/4] fix: fix failing test --- tests/test_run.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_run.rs b/tests/test_run.rs index f70088d..bc5b418 100644 --- a/tests/test_run.rs +++ b/tests/test_run.rs @@ -651,6 +651,7 @@ fn test_run_bootloader( parameter_config: ProverParametersConfig::default(), prover_config: ProverConfig::default(), fact_topologies_output: tmp_dir.path().join("fact_topologies.json"), + ignore_fact_topologies: false, }; match run_bootloader(&prove_bootloader_args, &tmp_dir) {