diff --git a/circuits/cpp/barretenberg/.gitrepo b/circuits/cpp/barretenberg/.gitrepo index be5a43a440da..314976ae54f8 100644 --- a/circuits/cpp/barretenberg/.gitrepo +++ b/circuits/cpp/barretenberg/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/AztecProtocol/barretenberg branch = master - commit = 65a38bc045c66c5f64e87ba8c6e446945f2f0a24 - parent = a931e077f2efac2aaa50c5336ead87a0e87a813e + commit = 5c91de7296e054f6d5ac3dca94ca85e06d496048 + parent = 899b05557365a5bf97e64793dd563a1b4bfa0f3f method = merge cmdver = 0.4.6 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 b85749209d38..cfc8fc59c5b7 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/cpp/src/barretenberg/bb/main.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/main.cpp index 9b3764a1b92d..506341e1849e 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/main.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/main.cpp @@ -11,8 +11,11 @@ #include using namespace barretenberg; - -uint32_t MAX_CIRCUIT_SIZE = 1 << 19; +// The maximum size that we can do in the browser is 2^19 +// based on memory constraints for UltraPlonk. +// However, since this will be ran natively, we can increase the +// size. +uint32_t MAX_CIRCUIT_SIZE = 1 << 23; std::string CRS_PATH = "./crs"; bool verbose = false; diff --git a/circuits/cpp/barretenberg/ts/src/crs/net_crs.ts b/circuits/cpp/barretenberg/ts/src/crs/net_crs.ts index 8a46fb48cb93..203968499248 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/circuits/cpp/barretenberg/ts/src/main.ts b/circuits/cpp/barretenberg/ts/src/main.ts index e70bedd121e7..eecda39aa0aa 100755 --- a/circuits/cpp/barretenberg/ts/src/main.ts +++ b/circuits/cpp/barretenberg/ts/src/main.ts @@ -8,8 +8,8 @@ import { Command } from 'commander'; createDebug.log = console.error.bind(console); const debug = createDebug('bb.js'); -// Maximum we support. -const MAX_CIRCUIT_SIZE = 2 ** 19; +// Maximum we support natively. It is 2^19 for browser. +const MAX_CIRCUIT_SIZE = 2 ** 23; function getBytecode(bytecodePath: string) { const encodedCircuit = readFileSync(bytecodePath, 'utf-8'); diff --git a/yarn-project/circuits.js/src/crs/index.ts b/yarn-project/circuits.js/src/crs/index.ts index ca2c6701ff50..41355990cc7d 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}`, },