From 899b05557365a5bf97e64793dd563a1b4bfa0f3f Mon Sep 17 00:00:00 2001 From: kevaundray Date: Tue, 22 Aug 2023 23:07:01 +0100 Subject: [PATCH] fix: Download SRS using one canonical URL across the codebase (#1748) resolves #1747 # Checklist: Remove the checklist to signal you've completed it. Enable auto-merge if the PR is ready to merge. - [ ] If the pull request requires a cryptography review (e.g. cryptographic algorithm implementations) I have added the 'crypto' tag. - [ ] I have reviewed my diff in github, line by line and removed unexpected formatting changes, testing logs, or commented-out code. - [ ] Every change is related to the PR description. - [ ] I have [linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) this pull request to relevant issues (if any exist). --- .../cpp/barretenberg/cpp/src/barretenberg/bb/get_crs.hpp | 4 ++-- circuits/cpp/barretenberg/ts/src/crs/net_crs.ts | 4 ++-- yarn-project/circuits.js/src/crs/index.ts | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_crs.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_crs.hpp index b85749209d3..cfc8fc59c5b 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_crs.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_crs.hpp @@ -20,10 +20,10 @@ inline std::vector download_g1_data(size_t num_points) inline std::vector download_g2_data() { - size_t g2_start = 28 + 5040000 * 64; + size_t g2_start = 28 + 5040001 * 64; size_t g2_end = g2_start + 128 - 1; std::string command = "curl -s -H \"Range: bytes=" + std::to_string(g2_start) + "-" + std::to_string(g2_end) + - "\" 'https://aztec-ignition.s3.amazonaws.com/MAIN%20IGNITION/sealed/transcript00.dat'"; + "\" 'https://aztec-ignition.s3.amazonaws.com/MAIN%20IGNITION/monomial/transcript00.dat'"; return exec_pipe(command); } diff --git a/circuits/cpp/barretenberg/ts/src/crs/net_crs.ts b/circuits/cpp/barretenberg/ts/src/crs/net_crs.ts index 8a46fb48cb9..20396849924 100644 --- a/circuits/cpp/barretenberg/ts/src/crs/net_crs.ts +++ b/circuits/cpp/barretenberg/ts/src/crs/net_crs.ts @@ -38,10 +38,10 @@ export class NetCrs { * Download the G2 points data. */ async downloadG2Data() { - const g2Start = 28 + 5040000 * 64; + const g2Start = 28 + 5040001 * 64; const g2End = g2Start + 128 - 1; - const response2 = await fetch('https://aztec-ignition.s3.amazonaws.com/MAIN%20IGNITION/sealed/transcript00.dat', { + const response2 = await fetch('https://aztec-ignition.s3.amazonaws.com/MAIN%20IGNITION/monomial/transcript00.dat', { headers: { Range: `bytes=${g2Start}-${g2End}`, }, diff --git a/yarn-project/circuits.js/src/crs/index.ts b/yarn-project/circuits.js/src/crs/index.ts index ca2c6701ff5..41355990cc7 100644 --- a/yarn-project/circuits.js/src/crs/index.ts +++ b/yarn-project/circuits.js/src/crs/index.ts @@ -27,7 +27,7 @@ export class NetCrs { const g1End = g1Start + this.numPoints * 64 - 1; // Download required range of data. - const response = await fetch('https://aztec-ignition.s3.amazonaws.com/MAIN%20IGNITION/sealed/transcript00.dat', { + const response = await fetch('https://aztec-ignition.s3.amazonaws.com/MAIN%20IGNITION/monomial/transcript00.dat', { headers: { Range: `bytes=${g1Start}-${g1End}`, }, @@ -42,10 +42,10 @@ export class NetCrs { * Download the G2 points data. */ async downloadG2Data() { - const g2Start = 28 + 5040000 * 64; + const g2Start = 28 + 5040001 * 64; const g2End = g2Start + 128 - 1; - const response2 = await fetch('https://aztec-ignition.s3.amazonaws.com/MAIN%20IGNITION/sealed/transcript00.dat', { + const response2 = await fetch('https://aztec-ignition.s3.amazonaws.com/MAIN%20IGNITION/monomial/transcript00.dat', { headers: { Range: `bytes=${g2Start}-${g2End}`, },