From 639ffa4c5726621d12808a7813b085782985837e Mon Sep 17 00:00:00 2001 From: ryardley Date: Mon, 30 Mar 2026 00:54:34 +0000 Subject: [PATCH] revert to github.com/AztecProtocol/aztec-packages --- circuits/bin/dkg/share_computation/Nargo.toml | 2 +- .../dkg/share_computation_chunk_batch/Nargo.toml | 2 +- .../bin/recursive_aggregation/fold/Nargo.toml | 2 +- .../wrapper/dkg/pk/Nargo.toml | 2 +- .../wrapper/dkg/share_computation/Nargo.toml | 2 +- .../wrapper/dkg/share_decryption/Nargo.toml | 2 +- .../wrapper/dkg/share_encryption/Nargo.toml | 2 +- .../decrypted_shares_aggregation/Nargo.toml | 2 +- .../wrapper/threshold/pk_aggregation/Nargo.toml | 2 +- .../wrapper/threshold/pk_generation/Nargo.toml | 2 +- .../threshold/share_decryption/Nargo.toml | 2 +- .../threshold/user_data_encryption/Nargo.toml | 2 +- crates/zk-prover/src/config.rs | 4 ++-- crates/zk-prover/versions.json | 10 +++++----- examples/CRISP/circuits/bin/fold/Nargo.toml | 2 +- flake.nix | 2 +- pnpm-lock.yaml | 16 ++++++++-------- scripts/nix-versions.sh | 2 +- 18 files changed, 30 insertions(+), 30 deletions(-) diff --git a/circuits/bin/dkg/share_computation/Nargo.toml b/circuits/bin/dkg/share_computation/Nargo.toml index dd1824e2f8..ecf02bc341 100644 --- a/circuits/bin/dkg/share_computation/Nargo.toml +++ b/circuits/bin/dkg/share_computation/Nargo.toml @@ -5,4 +5,4 @@ authors = [""] [dependencies] lib = { path = "../../../lib" } -bb_proof_verification = { git = "https://github.com/gnosisguild/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } \ No newline at end of file +bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } diff --git a/circuits/bin/dkg/share_computation_chunk_batch/Nargo.toml b/circuits/bin/dkg/share_computation_chunk_batch/Nargo.toml index 1bf04acae9..9f511c60cb 100644 --- a/circuits/bin/dkg/share_computation_chunk_batch/Nargo.toml +++ b/circuits/bin/dkg/share_computation_chunk_batch/Nargo.toml @@ -5,4 +5,4 @@ authors = [""] [dependencies] lib = { path = "../../../lib" } -bb_proof_verification = { git = "https://github.com/gnosisguild/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } \ No newline at end of file +bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } diff --git a/circuits/bin/recursive_aggregation/fold/Nargo.toml b/circuits/bin/recursive_aggregation/fold/Nargo.toml index e58b32207a..8bfe19c7f9 100644 --- a/circuits/bin/recursive_aggregation/fold/Nargo.toml +++ b/circuits/bin/recursive_aggregation/fold/Nargo.toml @@ -5,4 +5,4 @@ authors = ["Gnosis Guild / Enclave"] [dependencies] lib = { path = "../../../lib" } -bb_proof_verification = { git = "https://github.com/gnosisguild/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } \ No newline at end of file +bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } diff --git a/circuits/bin/recursive_aggregation/wrapper/dkg/pk/Nargo.toml b/circuits/bin/recursive_aggregation/wrapper/dkg/pk/Nargo.toml index 7e88c6408f..0b805350df 100644 --- a/circuits/bin/recursive_aggregation/wrapper/dkg/pk/Nargo.toml +++ b/circuits/bin/recursive_aggregation/wrapper/dkg/pk/Nargo.toml @@ -5,4 +5,4 @@ authors = ["Gnosis Guild / Enclave"] [dependencies] lib = { path = "../../../../../lib" } -bb_proof_verification = { git = "https://github.com/gnosisguild/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } \ No newline at end of file +bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } diff --git a/circuits/bin/recursive_aggregation/wrapper/dkg/share_computation/Nargo.toml b/circuits/bin/recursive_aggregation/wrapper/dkg/share_computation/Nargo.toml index 14951be3d1..21687b2657 100644 --- a/circuits/bin/recursive_aggregation/wrapper/dkg/share_computation/Nargo.toml +++ b/circuits/bin/recursive_aggregation/wrapper/dkg/share_computation/Nargo.toml @@ -5,4 +5,4 @@ authors = ["Gnosis Guild / Enclave"] [dependencies] lib = { path = "../../../../../lib" } -bb_proof_verification = { git = "https://github.com/gnosisguild/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } \ No newline at end of file +bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } diff --git a/circuits/bin/recursive_aggregation/wrapper/dkg/share_decryption/Nargo.toml b/circuits/bin/recursive_aggregation/wrapper/dkg/share_decryption/Nargo.toml index a175748043..425a3dab92 100644 --- a/circuits/bin/recursive_aggregation/wrapper/dkg/share_decryption/Nargo.toml +++ b/circuits/bin/recursive_aggregation/wrapper/dkg/share_decryption/Nargo.toml @@ -5,4 +5,4 @@ authors = ["Gnosis Guild / Enclave"] [dependencies] lib = { path = "../../../../../lib" } -bb_proof_verification = { git = "https://github.com/gnosisguild/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } \ No newline at end of file +bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } diff --git a/circuits/bin/recursive_aggregation/wrapper/dkg/share_encryption/Nargo.toml b/circuits/bin/recursive_aggregation/wrapper/dkg/share_encryption/Nargo.toml index e53495467d..868126a03c 100644 --- a/circuits/bin/recursive_aggregation/wrapper/dkg/share_encryption/Nargo.toml +++ b/circuits/bin/recursive_aggregation/wrapper/dkg/share_encryption/Nargo.toml @@ -5,4 +5,4 @@ authors = ["Gnosis Guild / Enclave"] [dependencies] lib = { path = "../../../../../lib" } -bb_proof_verification = { git = "https://github.com/gnosisguild/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } \ No newline at end of file +bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } diff --git a/circuits/bin/recursive_aggregation/wrapper/threshold/decrypted_shares_aggregation/Nargo.toml b/circuits/bin/recursive_aggregation/wrapper/threshold/decrypted_shares_aggregation/Nargo.toml index 6f23e79478..1c3d7bd63f 100644 --- a/circuits/bin/recursive_aggregation/wrapper/threshold/decrypted_shares_aggregation/Nargo.toml +++ b/circuits/bin/recursive_aggregation/wrapper/threshold/decrypted_shares_aggregation/Nargo.toml @@ -5,4 +5,4 @@ authors = ["Gnosis Guild / Enclave"] [dependencies] lib = { path = "../../../../../lib" } -bb_proof_verification = { git = "https://github.com/gnosisguild/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } \ No newline at end of file +bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } diff --git a/circuits/bin/recursive_aggregation/wrapper/threshold/pk_aggregation/Nargo.toml b/circuits/bin/recursive_aggregation/wrapper/threshold/pk_aggregation/Nargo.toml index 9019475922..00bb554013 100644 --- a/circuits/bin/recursive_aggregation/wrapper/threshold/pk_aggregation/Nargo.toml +++ b/circuits/bin/recursive_aggregation/wrapper/threshold/pk_aggregation/Nargo.toml @@ -5,4 +5,4 @@ authors = ["Gnosis Guild / Enclave"] [dependencies] lib = { path = "../../../../../lib" } -bb_proof_verification = { git = "https://github.com/gnosisguild/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } \ No newline at end of file +bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } diff --git a/circuits/bin/recursive_aggregation/wrapper/threshold/pk_generation/Nargo.toml b/circuits/bin/recursive_aggregation/wrapper/threshold/pk_generation/Nargo.toml index 174d57b993..2a8342e71f 100644 --- a/circuits/bin/recursive_aggregation/wrapper/threshold/pk_generation/Nargo.toml +++ b/circuits/bin/recursive_aggregation/wrapper/threshold/pk_generation/Nargo.toml @@ -5,4 +5,4 @@ authors = ["Gnosis Guild / Enclave"] [dependencies] lib = { path = "../../../../../lib" } -bb_proof_verification = { git = "https://github.com/gnosisguild/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } \ No newline at end of file +bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } diff --git a/circuits/bin/recursive_aggregation/wrapper/threshold/share_decryption/Nargo.toml b/circuits/bin/recursive_aggregation/wrapper/threshold/share_decryption/Nargo.toml index a175748043..425a3dab92 100644 --- a/circuits/bin/recursive_aggregation/wrapper/threshold/share_decryption/Nargo.toml +++ b/circuits/bin/recursive_aggregation/wrapper/threshold/share_decryption/Nargo.toml @@ -5,4 +5,4 @@ authors = ["Gnosis Guild / Enclave"] [dependencies] lib = { path = "../../../../../lib" } -bb_proof_verification = { git = "https://github.com/gnosisguild/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } \ No newline at end of file +bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } diff --git a/circuits/bin/threshold/user_data_encryption/Nargo.toml b/circuits/bin/threshold/user_data_encryption/Nargo.toml index 361d22f25e..688e4019e9 100644 --- a/circuits/bin/threshold/user_data_encryption/Nargo.toml +++ b/circuits/bin/threshold/user_data_encryption/Nargo.toml @@ -5,4 +5,4 @@ authors = ["Gnosis Guild / Enclave"] [dependencies] lib = { path = "../../../lib" } -bb_proof_verification = { git = "https://github.com/gnosisguild/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } +bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } diff --git a/crates/zk-prover/src/config.rs b/crates/zk-prover/src/config.rs index a7d4799986..6b69ed80ba 100644 --- a/crates/zk-prover/src/config.rs +++ b/crates/zk-prover/src/config.rs @@ -367,7 +367,7 @@ mod tests { let version = &config.required_bb_version; let (arch, os) = target.url_parts(); let url = format!( - "https://github.com/gnosisguild/aztec-packages/releases/download/v{version}/barretenberg-{arch}-{os}.tar.gz" + "https://github.com/AztecProtocol/aztec-packages/releases/download/v{version}/barretenberg-{arch}-{os}.tar.gz" ); println!("downloading {} from {}", target, url); @@ -430,7 +430,7 @@ mod tests { let version = &config.required_bb_version; let (arch, os) = target.url_parts(); let url = format!( - "https://github.com/gnosisguild/aztec-packages/releases/download/v{version}/barretenberg-{arch}-{os}.tar.gz" + "https://github.com/AztecProtocol/aztec-packages/releases/download/v{version}/barretenberg-{arch}-{os}.tar.gz" ); let client = reqwest::Client::new(); diff --git a/crates/zk-prover/versions.json b/crates/zk-prover/versions.json index b2027859eb..029030f7d1 100644 --- a/crates/zk-prover/versions.json +++ b/crates/zk-prover/versions.json @@ -1,12 +1,12 @@ { "required_bb_version": "3.0.0-nightly.20260102", "required_circuits_version": "0.1.15", - "bb_download_url": "https://github.com/gnosisguild/aztec-packages/releases/download/v{version}/barretenberg-{arch}-{os}.tar.gz", + "bb_download_url": "https://github.com/AztecProtocol/aztec-packages/releases/download/v{version}/barretenberg-{arch}-{os}.tar.gz", "bb_checksums": { - "amd64-linux": "5fa0d06de54c3cfc6d89e61b6ba309d3bd61d8c1a8057efe2205ef56a6278b0a", - "amd64-darwin": "9137b49be56bfea5b62203b7ae4cb67c9ecc12fe1692a89badf2cf4b57323fdc", - "arm64-linux": "a675221a823f6fada6d01b09a1c26c0f7356567f31a912a2475b6e3b63d438a2", - "arm64-darwin": "661fb3491d93c384299234a1f320bee6d682c5813b78bbe1ecba2e8bb8f7ab7d" + "amd64-linux": "0a4a331a40ef1a4f0e2fb745c38a02e2cbd32a9a5e71188d6f0d93ebee52a31f", + "amd64-darwin": "7740ccd76936efc12e80592c7f59a52e2c045a4aef4ab6ab90213b73402b521f", + "arm64-linux": "626d4b2b7c0895d9d4f1b6c74941685c14420f4c4d208fa19be670f486788fb7", + "arm64-darwin": "7c9c3fd4a9a3bfe0541eaf99a1cd0eb60fb366353ac108b2d07bbe73beb0fcb0" }, "circuits_download_url": "https://github.com/gnosisguild/enclave/releases/download/v{version}/circuits-{version}.tar.gz" } diff --git a/examples/CRISP/circuits/bin/fold/Nargo.toml b/examples/CRISP/circuits/bin/fold/Nargo.toml index 17d5516cfa..35da37b2ad 100644 --- a/examples/CRISP/circuits/bin/fold/Nargo.toml +++ b/examples/CRISP/circuits/bin/fold/Nargo.toml @@ -6,4 +6,4 @@ authors = ["Gnosis Guild / Enclave"] [dependencies] enclave_lib = { path = "../../../../../circuits/lib" } -bb_proof_verification = { git = "https://github.com/gnosisguild/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } +bb_proof_verification = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v3.0.0-nightly.20260102", directory = "barretenberg/noir/bb_proof_verification" } diff --git a/flake.nix b/flake.nix index ed3f3b74bb..eae8f767df 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,7 @@ pname = "barretenberg"; version = bbVersion; src = pkgs.fetchurl { - url = "https://github.com/gnosisguild/aztec-packages/releases/download/v${bbVersion}/barretenberg-${bbPlatform}.tar.gz"; + url = "https://github.com/AztecProtocol/aztec-packages/releases/download/v${bbVersion}/barretenberg-${bbPlatform}.tar.gz"; sha256 = bbHashes.${bbPlatform}; }; nativeBuildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [pkgs.autoPatchelfHook]; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 30327b5641..1cd2bacd24 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -728,7 +728,7 @@ importers: version: 5.3.0 '@risc0/ethereum': specifier: file:lib/risc0-ethereum - version: file:templates/default/lib/risc0-ethereum + version: risc0-ethereum@file:templates/default/lib/risc0-ethereum '@types/chai': specifier: ^4.2.0 version: 4.3.20 @@ -3100,9 +3100,6 @@ packages: '@reown/appkit@1.7.8': resolution: {integrity: sha512-51kTleozhA618T1UvMghkhKfaPcc9JlKwLJ5uV+riHyvSoWPKPRIa5A6M1Wano5puNyW0s3fwywhyqTHSilkaA==} - '@risc0/ethereum@file:templates/default/lib/risc0-ethereum': - resolution: {directory: templates/default/lib/risc0-ethereum, type: directory} - '@rolldown/pluginutils@1.0.0-beta.27': resolution: {integrity: sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==} @@ -8786,6 +8783,9 @@ packages: resolution: {integrity: sha512-5Di9UC0+8h1L6ZD2d7awM7E/T4uA1fJRlx6zk/NvdCCVEoAnFqvHmCuNeIKoCeIixBX/q8uM+6ycDvF8woqosA==} engines: {node: '>= 0.8'} + risc0-ethereum@file:templates/default/lib/risc0-ethereum: + resolution: {directory: templates/default/lib/risc0-ethereum, type: directory} + robust-predicates@3.0.2: resolution: {integrity: sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==} @@ -13241,8 +13241,6 @@ snapshots: - utf-8-validate - zod - '@risc0/ethereum@file:templates/default/lib/risc0-ethereum': {} - '@rolldown/pluginutils@1.0.0-beta.27': {} '@rollup/plugin-inject@5.0.5(rollup@4.52.5)': @@ -20114,7 +20112,7 @@ snapshots: '@noble/hashes': 1.8.0 '@scure/bip32': 1.7.0 '@scure/bip39': 1.6.0 - abitype: 1.1.1(typescript@5.8.3)(zod@3.25.76) + abitype: 1.1.1(typescript@5.8.3)(zod@3.22.4) eventemitter3: 5.0.1 optionalDependencies: typescript: 5.8.3 @@ -20968,6 +20966,8 @@ snapshots: hash-base: 3.1.2 inherits: 2.0.4 + risc0-ethereum@file:templates/default/lib/risc0-ethereum: {} + robust-predicates@3.0.2: {} rollup@4.52.5: @@ -22168,7 +22168,7 @@ snapshots: '@noble/hashes': 1.8.0 '@scure/bip32': 1.7.0 '@scure/bip39': 1.6.0 - abitype: 1.1.0(typescript@5.8.3)(zod@3.25.76) + abitype: 1.1.0(typescript@5.8.3)(zod@3.22.4) isows: 1.0.7(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10)) ox: 0.9.6(typescript@5.8.3) ws: 8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10) diff --git a/scripts/nix-versions.sh b/scripts/nix-versions.sh index 11a61be988..525e387117 100755 --- a/scripts/nix-versions.sh +++ b/scripts/nix-versions.sh @@ -23,7 +23,7 @@ for p in amd64-linux; do hex=$(jq -r ".bb_checksums[\"${p}\"]" "$VERSIONS_JSON") sri=$(nix hash convert --to sri --hash-algo sha256 "$hex") check "bb-${p}" \ - "https://github.com/gnosisguild/aztec-packages/releases/download/v${BB_VER}/barretenberg-${p}.tar.gz" \ + "https://github.com/AztecProtocol/aztec-packages/releases/download/v${BB_VER}/barretenberg-${p}.tar.gz" \ "$sri" done exit $FAIL