From 7ae8b1748a104cef0ea827a542168c7c5c8c6e78 Mon Sep 17 00:00:00 2001 From: jason <94618524+mellowcroc@users.noreply.github.com> Date: Tue, 8 Oct 2024 22:21:49 +0900 Subject: [PATCH 1/3] feat: update stone prover/verifier hashes to v6 --- build.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.rs b/build.rs index 385d7bd..15ca589 100644 --- a/build.rs +++ b/build.rs @@ -16,8 +16,8 @@ static DISTS: LazyLock> = LazyLock::new(|| { url: "https://github.com/zksecurity/stone-cli/releases/download/v0.1.0-alpha/stone-cli-linux-x86_64.tar.gz".to_string(), sha256_sums: vec![ "4a45808fd5ace7a88bfaa2b921baeb49f381d38afaa67e795b1038dd5a6adeff".to_string(), - "d5345e3e72a6180dabcec79ef35cefc735ea72864742e1cc117869da7d122ee5".to_string(), - "8ed3cad6cf3fb10f5a600af861c28b8f427244b0c2de920f1c18ea78371a66a9".to_string(), + "039d81f62004613f34bfb39b10c4b6b234e22a2b26c8b68c07701e5edaa98a33".to_string(), + "a13a1ae5a5f4109489bbe93f78a12778ec99a896e9f4fbe3c88f38d1f61612b2".to_string(), "672dbec290a5ab55a4e90d54d556d5d6f33f5ae9fdf8fd635b555172fdf6a34a".to_string(), ], }); @@ -25,8 +25,8 @@ static DISTS: LazyLock> = LazyLock::new(|| { url: "https://github.com/zksecurity/stone-cli/releases/download/v0.1.0-alpha/stone-cli-macos-aarch64.tar.gz".to_string(), sha256_sums: vec![ "37029e44bf8812b2fb38afebb3f47b0decfcf00b8ac29af6698615a507932511".to_string(), - "d91e8328b7a228445dda0b9d1acb21a86ab894727737e2d70a0210179b90f00e".to_string(), - "fc4090e3395e101f3481efc247ad590e5db7704c31321480522904d68ba5d009".to_string(), + "9d56eaa56eda5caa6853761f93d363dc3e9e9af27cf142cd0178dbcd4f61d405".to_string(), + "bfd92c9f8c6be41a0486c936b0f12df153ee2743edbf782e21f15fa56e3bdb70".to_string(), "672dbec290a5ab55a4e90d54d556d5d6f33f5ae9fdf8fd635b555172fdf6a34a".to_string(), ], }); @@ -121,11 +121,11 @@ fn download_executables(config: &Config) { let download_file_path = download_dir.join(download_file_name); download_from_url(url, &download_file_path); unzip_file(&download_file_path, &download_dir); - move_files(&download_dir, &download_file_name, &config.file_names); + move_files(&download_dir, download_file_name, &config.file_names); remove_file(&download_file_path).expect("Failed to remove tar file"); let sha256_sums = &dist.sha256_sums; - validate_unpacked_files(&download_dir, &config.file_names, &sha256_sums); + validate_unpacked_files(&download_dir, &config.file_names, sha256_sums); set_execute_permissions(config); } From 4cda098dcd1268120792e51cf25dee007394590c Mon Sep 17 00:00:00 2001 From: jason <94618524+mellowcroc@users.noreply.github.com> Date: Tue, 8 Oct 2024 23:16:27 +0900 Subject: [PATCH 2/3] refactor: remove unnecessary cairo_verifier.sierra.json --- build.rs | 2 -- configs/env.json | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/build.rs b/build.rs index 15ca589..77803fe 100644 --- a/build.rs +++ b/build.rs @@ -18,7 +18,6 @@ static DISTS: LazyLock> = LazyLock::new(|| { "4a45808fd5ace7a88bfaa2b921baeb49f381d38afaa67e795b1038dd5a6adeff".to_string(), "039d81f62004613f34bfb39b10c4b6b234e22a2b26c8b68c07701e5edaa98a33".to_string(), "a13a1ae5a5f4109489bbe93f78a12778ec99a896e9f4fbe3c88f38d1f61612b2".to_string(), - "672dbec290a5ab55a4e90d54d556d5d6f33f5ae9fdf8fd635b555172fdf6a34a".to_string(), ], }); m.insert((Os::MacOS, Arch::Aarch64), Artifacts { @@ -27,7 +26,6 @@ static DISTS: LazyLock> = LazyLock::new(|| { "37029e44bf8812b2fb38afebb3f47b0decfcf00b8ac29af6698615a507932511".to_string(), "9d56eaa56eda5caa6853761f93d363dc3e9e9af27cf142cd0178dbcd4f61d405".to_string(), "bfd92c9f8c6be41a0486c936b0f12df153ee2743edbf782e21f15fa56e3bdb70".to_string(), - "672dbec290a5ab55a4e90d54d556d5d6f33f5ae9fdf8fd635b555172fdf6a34a".to_string(), ], }); m diff --git a/configs/env.json b/configs/env.json index c0faf1e..373c2ee 100644 --- a/configs/env.json +++ b/configs/env.json @@ -3,13 +3,11 @@ "file_names": [ "cairo1-run", "cpu_air_prover", - "cpu_air_verifier", - "cairo_verifier.sierra.json" + "cpu_air_verifier" ], "env_names": [ "CAIRO1_RUN", "CPU_AIR_PROVER", - "CPU_AIR_VERIFIER", - "CAIRO_VERIFIER" + "CPU_AIR_VERIFIER" ] } \ No newline at end of file From d5e7db1ae29f75a871d4a267e4e241498ff62e14 Mon Sep 17 00:00:00 2001 From: jason <94618524+mellowcroc@users.noreply.github.com> Date: Tue, 8 Oct 2024 23:28:54 +0900 Subject: [PATCH 3/3] feat: update cairo1-run version build from https://github.com/lambdaclass/cairo-vm/commit/3fb0344ce038b3a68cae897c403d1f561cfe8da7, also update cairo to v2.8.4 --- build.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.rs b/build.rs index 77803fe..d8cfe39 100644 --- a/build.rs +++ b/build.rs @@ -15,7 +15,7 @@ static DISTS: LazyLock> = LazyLock::new(|| { m.insert((Os::Linux, Arch::Amd64), Artifacts { url: "https://github.com/zksecurity/stone-cli/releases/download/v0.1.0-alpha/stone-cli-linux-x86_64.tar.gz".to_string(), sha256_sums: vec![ - "4a45808fd5ace7a88bfaa2b921baeb49f381d38afaa67e795b1038dd5a6adeff".to_string(), + "2a100342be0660fc8363e7ac6230ffd9ea0937e7afc35265b7af1595d64dcff4".to_string(), "039d81f62004613f34bfb39b10c4b6b234e22a2b26c8b68c07701e5edaa98a33".to_string(), "a13a1ae5a5f4109489bbe93f78a12778ec99a896e9f4fbe3c88f38d1f61612b2".to_string(), ], @@ -23,7 +23,7 @@ static DISTS: LazyLock> = LazyLock::new(|| { m.insert((Os::MacOS, Arch::Aarch64), Artifacts { url: "https://github.com/zksecurity/stone-cli/releases/download/v0.1.0-alpha/stone-cli-macos-aarch64.tar.gz".to_string(), sha256_sums: vec![ - "37029e44bf8812b2fb38afebb3f47b0decfcf00b8ac29af6698615a507932511".to_string(), + "22b3d5a9d9c9bbaab6196a3ff4d372e765fa75c50272d20fc562917849974a2b".to_string(), "9d56eaa56eda5caa6853761f93d363dc3e9e9af27cf142cd0178dbcd4f61d405".to_string(), "bfd92c9f8c6be41a0486c936b0f12df153ee2743edbf782e21f15fa56e3bdb70".to_string(), ], @@ -145,7 +145,7 @@ fn set_execute_permissions(config: &Config) { fn download_corelib_repo() { let download_dir = Path::new(env!("HOME")).join(".stone-cli"); let corelib_dir = Path::new(env!("HOME")).join(download_dir.join("corelib")); - let url = "https://github.com/starkware-libs/cairo/releases/download/v2.6.3/release-x86_64-unknown-linux-musl.tar.gz"; + let url = "https://github.com/starkware-libs/cairo/releases/download/v2.8.4/release-x86_64-unknown-linux-musl.tar.gz"; let download_file_path = download_dir.join("release-x86_64-unknown-linux-musl.tar.gz"); if !corelib_dir.exists() { download_from_url(url, &download_file_path);