Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"lint": "NODE_NO_WARNINGS=1 eslint . --max-warnings 0"
},
"dependencies": {
"@aztec/bb.js": "0.77.1",
"@aztec/bb.js": "0.81.0",
"@noir-lang/noir_js": "workspace:*",
"@noir-lang/noir_wasm": "workspace:*",
"@nomicfoundation/hardhat-chai-matchers": "^2.0.8",
Expand Down
8 changes: 4 additions & 4 deletions examples/recursion/generate_recursive_proof.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ FULL_PROOF_AS_FIELDS="$($BACKEND prove -b ./target/sum.json -w ./target/sum_witn

echo $FULL_PROOF_AS_FIELDS | jq 'length'
# sum has 3 public inputs
PUBLIC_INPUTS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[3:6]')
PROOF_AS_FIELDS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[:3] + .[6:]')
PUBLIC_INPUTS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[:3]')
PROOF_AS_FIELDS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[3:]')

RECURSE_LEAF_PROVER_TOML=./recurse_leaf/Prover.toml
echo -n "" > $RECURSE_LEAF_PROVER_TOML
Expand Down Expand Up @@ -46,8 +46,8 @@ VK_AS_FIELDS=$(jq -r '.[0:]' ./target/recurse_leaf_vk_as_fields)

FULL_PROOF_AS_FIELDS="$($BACKEND prove -b ./target/recurse_leaf.json -w ./target/recurse_leaf_witness.gz --honk_recursion 1 --init_kzg_accumulator --output_format fields -o -)"
# recurse_leaf has 4 public inputs (excluding aggregation object)
PUBLIC_INPUTS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[3:7]')
PROOF_AS_FIELDS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[:3] + .[7:]')
PUBLIC_INPUTS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[:4]')
PROOF_AS_FIELDS=$(echo $FULL_PROOF_AS_FIELDS | jq -r '.[4:]')

RECURSE_NODE_PROVER_TOML=./recurse_node/Prover.toml
echo -n "" > $RECURSE_NODE_PROVER_TOML
Expand Down
2 changes: 1 addition & 1 deletion examples/recursion/recurse_leaf/src/main.nr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
global ULTRA_HONK_VK_SIZE: u32 = 128;
global ULTRA_HONK_PROOF_SIZE: u32 = 459;
global ULTRA_HONK_PROOF_SIZE: u32 = 456;
global NUM_NON_ACCUMULATOR_PUBLIC_INPUTS: u32 = 3;
global HONK_IDENTIFIER: u32 = 1;

Expand Down
2 changes: 1 addition & 1 deletion examples/recursion/recurse_node/src/main.nr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
global ULTRA_HONK_VK_SIZE: u32 = 128;
global ULTRA_HONK_PROOF_SIZE: u32 = 459; // Number of fields when recursion is enabled
global ULTRA_HONK_PROOF_SIZE: u32 = 456; // Number of fields when recursion is enabled
global NUM_NON_ACCUMULATOR_PUBLIC_INPUTS: u32 = 4;
global HONK_IDENTIFIER: u32 = 1;

Expand Down
11 changes: 4 additions & 7 deletions examples/solidity_verifier/solidity_verifier.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,14 @@ PROOF_HEX=$(cat $PROOF_PATH | od -An -v -t x1 | tr -d $' \n' | sed 's/^.\{8\}//'

NUM_PUBLIC_INPUTS=2
PUBLIC_INPUT_HEX_CHARS=$((32 * $NUM_PUBLIC_INPUTS * 2)) # Each public input is 32 bytes, 2 chars per byte
PUBLIC_INPUT_OFFSET_CHARS=$((96 * 2)) # First 96 bytes are the proof header

# Extract public inputs from proof - from 96th byte to 96 + 32 * NUM_PUBLIC_INPUTS bytes
HEX_PUBLIC_INPUTS=${PROOF_HEX:$PUBLIC_INPUT_OFFSET_CHARS:$PUBLIC_INPUT_HEX_CHARS}
# Extract public inputs from proof - first 32 * NUM_PUBLIC_INPUTS bytes
HEX_PUBLIC_INPUTS=${PROOF_HEX:0:$PUBLIC_INPUT_HEX_CHARS}
# Split public inputs into strings where each string represents a `bytes32`.
SPLIT_HEX_PUBLIC_INPUTS=$(sed -e 's/.\{64\}/0x&,/g' <<<$HEX_PUBLIC_INPUTS)

# Extract proof without public inputs - from 0 to 96 bytes + the part after public inputs
PROOF_WITHOUT_PUBLIC_INPUTS_START=${PROOF_HEX:0:$PUBLIC_INPUT_OFFSET_CHARS}
PROOF_WITHOUT_PUBLIC_INPUTS_END=${PROOF_HEX:$(($PUBLIC_INPUT_OFFSET_CHARS + $PUBLIC_INPUT_HEX_CHARS))}
PROOF_WITHOUT_PUBLIC_INPUTS="${PROOF_WITHOUT_PUBLIC_INPUTS_START}${PROOF_WITHOUT_PUBLIC_INPUTS_END}"
# Extract proof without public inputs
PROOF_WITHOUT_PUBLIC_INPUTS=${PROOF_HEX:$PUBLIC_INPUT_HEX_CHARS}

# Spin up an anvil node to deploy the contract to
anvil &
Expand Down
2 changes: 1 addition & 1 deletion scripts/install_bb.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

VERSION="0.77.1"
VERSION="0.81.0"

BBUP_PATH=~/.bb/bbup

Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,9 @@ __metadata:
languageName: node
linkType: hard

"@aztec/bb.js@npm:0.77.1":
version: 0.77.1
resolution: "@aztec/bb.js@npm:0.77.1"
"@aztec/bb.js@npm:0.81.0":
version: 0.81.0
resolution: "@aztec/bb.js@npm:0.81.0"
dependencies:
comlink: "npm:^4.4.1"
commander: "npm:^12.1.0"
Expand All @@ -250,7 +250,7 @@ __metadata:
tslib: "npm:^2.4.0"
bin:
bb.js: dest/node/main.js
checksum: 10/fdfb27a52b326d5fc9c5119ce70bc8277fdccc8c7e5edcc7d4100904af25de3fffb59eb61cb3d0edbab9eac51555b86a81638946f1288d3b227566c7e6ad83a2
checksum: 10/0ef05d95590f4126d1deca033f7443e89a66c3cd8985b93fe71a2c90a570e54085deb1ab67379de1c2c7ec32e9e75532f45b7e1df194fd056a4f070cfe822acd
languageName: node
linkType: hard

Expand Down Expand Up @@ -18699,7 +18699,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "integration-tests@workspace:compiler/integration-tests"
dependencies:
"@aztec/bb.js": "npm:0.77.1"
"@aztec/bb.js": "npm:0.81.0"
"@noir-lang/noir_js": "workspace:*"
"@noir-lang/noir_wasm": "workspace:*"
"@nomicfoundation/hardhat-chai-matchers": "npm:^2.0.8"
Expand Down
Loading