diff --git a/.github/workflows/upload_artifacts_workflow.yml b/.github/workflows/upload_artifacts_workflow.yml index ca38449e..ac42de60 100644 --- a/.github/workflows/upload_artifacts_workflow.yml +++ b/.github/workflows/upload_artifacts_workflow.yml @@ -3,7 +3,7 @@ name: Upload-Artifacts on: push: branches: - - main + - noa/update-commit-upload_artifacts_workflow jobs: artifacts-push: @@ -13,7 +13,7 @@ jobs: - name: Get commit hash prefix for PR update env: - COMMIT_SHA: ${{ github.sha }} + COMMIT_SHA: 89155aade81a2727937d1734a117b118ec97540b run: | echo "SHORT_HASH=${COMMIT_SHA:0:7}" >> $GITHUB_ENV diff --git a/Cargo.lock b/Cargo.lock index eaf000fc..71e36194 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -705,8 +705,35 @@ dependencies = [ "starknet-ff", "starknet-types-core", "stwo", - "stwo-cairo-common", - "stwo-cairo-serialize", + "stwo-cairo-common 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", + "stwo-cairo-serialize 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", + "stwo-constraint-framework", + "thiserror 2.0.18", + "tracing", +] + +[[package]] +name = "cairo-air" +version = "1.2.2" +source = "git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29#971de93b456248b1b073a130625b9df8520a1a29" +dependencies = [ + "bincode 1.3.3", + "bzip2", + "clap", + "itertools 0.12.1", + "log", + "num-traits", + "paste", + "rayon", + "serde", + "serde_json", + "sonic-rs", + "starknet-curve 0.6.0", + "starknet-ff", + "starknet-types-core", + "stwo", + "stwo-cairo-common 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", + "stwo-cairo-serialize 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", "stwo-constraint-framework", "thiserror 2.0.18", "tracing", @@ -1439,7 +1466,7 @@ name = "circuit-cairo-verifier" version = "0.1.0" source = "git+https://github.com/starkware-libs/stwo-circuits?rev=0451681a86cc4755b848d342f6edbf3a240f2627#0451681a86cc4755b848d342f6edbf3a240f2627" dependencies = [ - "cairo-air", + "cairo-air 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", "circuit-common", "circuits", "circuits-stark-verifier", @@ -1449,7 +1476,7 @@ dependencies = [ "num-traits", "serde_json", "stwo", - "stwo-cairo-common", + "stwo-cairo-common 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", "stwo-constraint-framework", ] @@ -1463,7 +1490,7 @@ dependencies = [ "itertools 0.12.1", "rand_chacha 0.3.1", "stwo", - "stwo-cairo-common", + "stwo-cairo-common 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", "stwo-constraint-framework", ] @@ -1484,8 +1511,8 @@ dependencies = [ "stwo", "stwo-air-utils", "stwo-air-utils-derive", - "stwo-cairo-common", - "stwo-cairo-prover", + "stwo-cairo-common 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", + "stwo-cairo-prover 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", "stwo-constraint-framework", ] @@ -1525,7 +1552,7 @@ dependencies = [ "itertools 0.12.1", "num-traits", "stwo", - "stwo-cairo-common", + "stwo-cairo-common 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", ] [[package]] @@ -3203,7 +3230,7 @@ name = "privacy-circuit-verify" version = "1.2.2" dependencies = [ "anyhow", - "cairo-air", + "cairo-air 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", "cairo-vm", "circuit-cairo-verifier", "circuit-common", @@ -3225,8 +3252,8 @@ dependencies = [ "starknet-ff", "starknet-types-core", "stwo", - "stwo-cairo-common", - "stwo-cairo-serialize", + "stwo-cairo-common 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", + "stwo-cairo-serialize 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", "tempfile", "tracing", "tracing-subscriber", @@ -3238,7 +3265,7 @@ name = "privacy-prove" version = "1.2.2" dependencies = [ "anyhow", - "cairo-air", + "cairo-air 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", "cairo-program-runner-lib", "cairo-vm", "circuit-cairo-verifier", @@ -3262,10 +3289,10 @@ dependencies = [ "starknet-ff", "starknet-types-core", "stwo", - "stwo-cairo-adapter", - "stwo-cairo-common", - "stwo-cairo-prover", - "stwo-cairo-serialize", + "stwo-cairo-adapter 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", + "stwo-cairo-common 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", + "stwo-cairo-prover 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", + "stwo-cairo-serialize 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", "tempfile", "thiserror 1.0.69", "tracing", @@ -4332,7 +4359,32 @@ dependencies = [ "serde", "serde_json", "stwo", - "stwo-cairo-common", + "stwo-cairo-common 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", + "thiserror 2.0.18", + "tracing", +] + +[[package]] +name = "stwo-cairo-adapter" +version = "1.2.2" +source = "git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29#971de93b456248b1b073a130625b9df8520a1a29" +dependencies = [ + "anyhow", + "bincode 2.0.1", + "bytemuck", + "cairo-vm", + "clap", + "crypto-bigint", + "dashmap", + "indoc", + "itertools 0.12.1", + "log", + "memmap2", + "rayon", + "serde", + "serde_json", + "stwo", + "stwo-cairo-common 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", "thiserror 2.0.18", "tracing", ] @@ -4352,7 +4404,26 @@ dependencies = [ "starknet-ff", "starknet-types-core", "stwo", - "stwo-cairo-serialize", + "stwo-cairo-serialize 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", + "stwo-constraint-framework", +] + +[[package]] +name = "stwo-cairo-common" +version = "1.2.2" +source = "git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29#971de93b456248b1b073a130625b9df8520a1a29" +dependencies = [ + "bytemuck", + "itertools 0.12.1", + "rayon", + "ruint", + "serde", + "serde_arrays", + "starknet-curve 0.6.0", + "starknet-ff", + "starknet-types-core", + "stwo", + "stwo-cairo-serialize 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", "stwo-constraint-framework", ] @@ -4363,7 +4434,40 @@ source = "git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d#68b4af6d dependencies = [ "anyhow", "bytemuck", - "cairo-air", + "cairo-air 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", + "dashmap", + "getrandom 0.2.17", + "getrandom 0.3.4", + "hex", + "indexmap", + "itertools 0.12.1", + "num-traits", + "paste", + "rayon", + "serde", + "serde_json", + "sonic-rs", + "starknet-curve 0.6.0", + "starknet-ff", + "starknet-types-core", + "stwo", + "stwo-air-utils", + "stwo-air-utils-derive", + "stwo-cairo-adapter 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", + "stwo-cairo-common 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", + "stwo-cairo-serialize 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", + "stwo-constraint-framework", + "tracing", +] + +[[package]] +name = "stwo-cairo-prover" +version = "1.2.2" +source = "git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29#971de93b456248b1b073a130625b9df8520a1a29" +dependencies = [ + "anyhow", + "bytemuck", + "cairo-air 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", "dashmap", "getrandom 0.2.17", "getrandom 0.3.4", @@ -4382,9 +4486,9 @@ dependencies = [ "stwo", "stwo-air-utils", "stwo-air-utils-derive", - "stwo-cairo-adapter", - "stwo-cairo-common", - "stwo-cairo-serialize", + "stwo-cairo-adapter 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", + "stwo-cairo-common 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", + "stwo-cairo-serialize 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", "stwo-constraint-framework", "tracing", ] @@ -4396,7 +4500,17 @@ source = "git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d#68b4af6d dependencies = [ "starknet-ff", "stwo", - "stwo-cairo-serialize-derive", + "stwo-cairo-serialize-derive 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d)", +] + +[[package]] +name = "stwo-cairo-serialize" +version = "1.2.2" +source = "git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29#971de93b456248b1b073a130625b9df8520a1a29" +dependencies = [ + "starknet-ff", + "stwo", + "stwo-cairo-serialize-derive 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", ] [[package]] @@ -4408,10 +4522,19 @@ dependencies = [ "syn 2.0.118", ] +[[package]] +name = "stwo-cairo-serialize-derive" +version = "1.2.2" +source = "git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29#971de93b456248b1b073a130625b9df8520a1a29" +dependencies = [ + "quote", + "syn 2.0.118", +] + [[package]] name = "stwo-cairo-utils" version = "1.2.2" -source = "git+https://github.com/starkware-libs/stwo-cairo?rev=68b4af6d#68b4af6dc8efa64a35722239f3a6834727fd772e" +source = "git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29#971de93b456248b1b073a130625b9df8520a1a29" dependencies = [ "env_logger", "log", @@ -4439,7 +4562,7 @@ name = "stwo-run-and-prove" version = "1.2.2" dependencies = [ "anyhow", - "cairo-air", + "cairo-air 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", "cairo-program-runner-lib", "cairo-vm", "clap", @@ -4451,8 +4574,8 @@ dependencies = [ "serde_json", "sonic-rs", "starknet-ff", - "stwo-cairo-adapter", - "stwo-cairo-serialize", + "stwo-cairo-adapter 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", + "stwo-cairo-serialize 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", "stwo-cairo-utils", "stwo-run-and-prove-common", "tempfile", @@ -4465,10 +4588,10 @@ name = "stwo-run-and-prove-common" version = "1.2.2" dependencies = [ "anyhow", - "cairo-air", + "cairo-air 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", "mockall", - "stwo-cairo-adapter", - "stwo-cairo-prover", + "stwo-cairo-adapter 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", + "stwo-cairo-prover 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", ] [[package]] @@ -4476,7 +4599,7 @@ name = "stwo-run-and-prove-recursive-tree" version = "1.2.2" dependencies = [ "anyhow", - "cairo-air", + "cairo-air 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", "cairo-program-runner-lib", "cairo-vm", "clap", @@ -4488,8 +4611,8 @@ dependencies = [ "serde_json", "sonic-rs", "starknet-ff", - "stwo-cairo-adapter", - "stwo-cairo-serialize", + "stwo-cairo-adapter 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", + "stwo-cairo-serialize 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", "stwo-cairo-utils", "stwo-run-and-prove-common", "tempfile", @@ -4514,7 +4637,7 @@ dependencies = [ "log", "num-traits", "serde_json", - "stwo-cairo-adapter", + "stwo-cairo-adapter 1.2.2 (git+https://github.com/starkware-libs/stwo-cairo?rev=971de93b456248b1b073a130625b9df8520a1a29)", "stwo-cairo-utils", "tempfile", "thiserror 1.0.69", diff --git a/Cargo.toml b/Cargo.toml index f93a843d..85491448 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -61,12 +61,12 @@ cairo-lang-execute-utils = "2.19.0-rc.0" cairo-lang-utils = "2.19.0-rc.0" # stwo cairo -cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" } -stwo-cairo-utils = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" } -stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" } -stwo-cairo-prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" } -stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" } -stwo-cairo-common = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "68b4af6d" } +cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "971de93b456248b1b073a130625b9df8520a1a29" } +stwo-cairo-utils = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "971de93b456248b1b073a130625b9df8520a1a29" } +stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "971de93b456248b1b073a130625b9df8520a1a29" } +stwo-cairo-prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "971de93b456248b1b073a130625b9df8520a1a29" } +stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "971de93b456248b1b073a130625b9df8520a1a29" } +stwo-cairo-common = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "971de93b456248b1b073a130625b9df8520a1a29" } # local crates