Merge remote-tracking branch 'origin/master' into lx/ipa-in-rollup

.devcontainer/dev/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "name": "Development",
-  "image": "aztecprotocol/devbox:1.0",
+  "image": "aztecprotocol/devbox:1.2",
   "features": {
     // Use custom fork with noble added to list of supported distros.
     "./docker-in-docker": {}

.github/workflows/publish-aztec-packages.yml

@@ -211,7 +211,7 @@ jobs:
       - name: Publish aztec manifests
         if: ${{ env.SHOULD_PUBLISH_DOCKER_IMAGES == 'true' }}
         run: |
-          if [ "${{ github.ref_name }}" == "release/*" ]; then
+          if [[ "${{ github.ref_name }}" =~ ^release/ ]]; then
             TAG="${{ github.ref_name }}"
             VERSION="${TAG#release/}"
             DIST_TAG=devnet
@@ -282,7 +282,7 @@ jobs:
       - name: Set tags and versions
         id: version_step
         run: |
-          if [ "${{ github.ref_name }}" == "release/*" ]; then
+          if [[ "${{ github.ref_name }}" =~ ^release/ ]]; then
             DIST_TAG=devnet
             TAG=${{ env.DEPLOY_TAG }}
             VERSION=${TAG#aztec-packages-v}-devnet
@@ -356,7 +356,7 @@ jobs:
       - name: Publish aztec-up
         working-directory: ./aztec-up/terraform
         run: |
-          if [ "${{ github.ref_name }}" == "release/*" ]; then
+          if [[ "${{ github.ref_name }}" =~ ^release/ ]]; then
             TAG="${{ github.ref_name }}"
             VERSION="${TAG#release/}"
           elif [ -n "${{ env.DEPLOY_TAG }}" ]; then

.github/workflows/release-please.yml

@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - master
-      - "release/*"
 
 permissions:
   contents: write

.release-please-manifest.json

@@ -1,7 +1,7 @@
 {
-  ".": "0.67.0",
+  ".": "0.67.1",
   "yarn-project/cli": "0.35.1",
-  "yarn-project/aztec": "0.67.0",
-  "barretenberg": "0.67.0",
-  "barretenberg/ts": "0.67.0"
+  "yarn-project/aztec": "0.67.1",
+  "barretenberg": "0.67.1",
+  "barretenberg/ts": "0.67.1"
 }

avm-transpiler/src/transpile.rs

@@ -1064,29 +1064,30 @@ fn handle_black_box_function(avm_instrs: &mut Vec<AvmInstruction>, operation: &B
                 ..Default::default()
             });
         }
-        BlackBoxOp::ToRadix { input, radix, output, output_bits } => {
-            let num_limbs = output.size as u32;
+        BlackBoxOp::ToRadix { input, radix, output_pointer, num_limbs, output_bits } => {
             let input_offset = input.to_usize() as u32;
-            let output_offset = output.pointer.to_usize() as u32;
             let radix_offset = radix.to_usize() as u32;
+            let output_offset = output_pointer.to_usize() as u32;
+            let num_limbs_offset = num_limbs.to_usize() as u32;
+            let output_bits_offset = output_bits.to_usize() as u32;
 
             avm_instrs.push(AvmInstruction {
                 opcode: AvmOpcode::TORADIXBE,
                 indirect: Some(
                     AddressingModeBuilder::default()
                         .direct_operand(input)
-                        .indirect_operand(&output.pointer)
                         .direct_operand(radix)
+                        .direct_operand(num_limbs)
+                        .direct_operand(output_bits)
+                        .indirect_operand(output_pointer)
                         .build(),
                 ),
                 operands: vec![
                     AvmOperand::U16 { value: input_offset as u16 },
-                    AvmOperand::U16 { value: output_offset as u16 },
                     AvmOperand::U16 { value: radix_offset as u16 },
-                ],
-                immediates: vec![
-                    AvmOperand::U16 { value: num_limbs as u16 },
-                    AvmOperand::U8 { value: *output_bits as u8 },
+                    AvmOperand::U16 { value: num_limbs_offset as u16 },
+                    AvmOperand::U16 { value: output_bits_offset as u16 },
+                    AvmOperand::U16 { value: output_offset as u16 },
                 ],
                 ..Default::default()
             });

barretenberg/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 9f6fda1a3d99c75532767eaac8ea3b783a450acb
-	parent = bab9f852c08f29f022bf526aacb8350732fcf4ac
+	commit = c6f0e4997cda15c88022515563f9dceaab31f018
+	parent = c90bb16a5880c42752809f383f517181e6f8a53a
 	method = merge
 	cmdver = 0.4.6

barretenberg/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [0.67.1](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.67.0...barretenberg-v0.67.1) (2024-12-17)
+
+
+### Features
+
+* Add tree equality assertions ([#10756](https://github.com/AztecProtocol/aztec-packages/issues/10756)) ([923826a](https://github.com/AztecProtocol/aztec-packages/commit/923826a9d1bbed6739527a82b34d5610600eca1b))
+* Better initialization for permutation mapping components ([#10750](https://github.com/AztecProtocol/aztec-packages/issues/10750)) ([1516d7f](https://github.com/AztecProtocol/aztec-packages/commit/1516d7f7bd6a2adbb650bd7cdd572b33db98dbfc))
+* Don't store every block number in block indices DB ([#10658](https://github.com/AztecProtocol/aztec-packages/issues/10658)) ([a3fba84](https://github.com/AztecProtocol/aztec-packages/commit/a3fba8442fdd62f429054c3367984fd4206bbbeb))
+* Leaf index requests to the native world state can now be performed as a batch query ([#10649](https://github.com/AztecProtocol/aztec-packages/issues/10649)) ([a437e73](https://github.com/AztecProtocol/aztec-packages/commit/a437e73558a936981f3eb3ba022b0770b75d9060))
+* New 17 in 20 IVC bench added to actions ([#10777](https://github.com/AztecProtocol/aztec-packages/issues/10777)) ([9fbcff6](https://github.com/AztecProtocol/aztec-packages/commit/9fbcff60a63e0eca14c4e28677aed1fc5e6f2c14))
+* Note hash management in the AVM ([#10666](https://github.com/AztecProtocol/aztec-packages/issues/10666)) ([e077980](https://github.com/AztecProtocol/aztec-packages/commit/e077980f8cce1fc7922c27d368b6dbced956aad2))
+* Sumcheck with disabled rows ([#10068](https://github.com/AztecProtocol/aztec-packages/issues/10068)) ([abd2226](https://github.com/AztecProtocol/aztec-packages/commit/abd2226da3a159e7efb7cbef099e41739f665ef1))
+
+
+### Bug Fixes
+
+* Avm gas and non-member ([#10709](https://github.com/AztecProtocol/aztec-packages/issues/10709)) ([dd8cc7b](https://github.com/AztecProtocol/aztec-packages/commit/dd8cc7b93119c0376873a366a8310d2ebd2641de))
+* AVM witgen track gas for nested calls and external halts ([#10731](https://github.com/AztecProtocol/aztec-packages/issues/10731)) ([b8bdb52](https://github.com/AztecProtocol/aztec-packages/commit/b8bdb529719c1f72244e904ea667462458a43317))
+* Use correct size for databus_id ([#10673](https://github.com/AztecProtocol/aztec-packages/issues/10673)) ([95eb658](https://github.com/AztecProtocol/aztec-packages/commit/95eb658f90687c75589b345f95a904d96e2a8e62))
+
+
+### Miscellaneous
+
+* **avm:** Radix opcode - remove immediates ([#10696](https://github.com/AztecProtocol/aztec-packages/issues/10696)) ([4ac13e6](https://github.com/AztecProtocol/aztec-packages/commit/4ac13e642c958392ce5606684c044ea014325e26)), closes [#10371](https://github.com/AztecProtocol/aztec-packages/issues/10371)
+* Move decider PK allocation to methods ([#10670](https://github.com/AztecProtocol/aztec-packages/issues/10670)) ([1ab9e30](https://github.com/AztecProtocol/aztec-packages/commit/1ab9e30d339cfd7a80f333e408c367c1f8bf49f8))
+
 ## [0.67.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.66.0...barretenberg-v0.67.0) (2024-12-13)
 
 

barretenberg/acir_tests/regenerate_verify_honk_proof_inputs.sh

@@ -31,7 +31,7 @@ if [ ! -d "$TOML_DIR" ]; then
 fi
 
 echo "Generating recursion inputs and writing to directory $TOML_DIR"
-$BIN write_recursion_inputs_rollup_honk $VERBOSE -c $CRS_PATH -b ./target/program.json -o "$TOML_DIR" --recursive
+$BIN write_recursion_inputs_honk --recursive $VERBOSE -c $CRS_PATH -b ./target/program.json -o "$TOML_DIR"
 
 cd ../..
 ./reset_acir_tests.sh --no-rebuild-nargo --programs "$RECURSIVE_PROGRAM"

barretenberg/acir_tests/sol-test/src/index.js

@@ -4,8 +4,9 @@ import { spawn } from "child_process";
 import { ethers } from "ethers";
 import solc from "solc";
 
+// Size excluding number of public inputs
 const NUMBER_OF_FIELDS_IN_PLONK_PROOF = 93;
-const NUMBER_OF_FIELDS_IN_HONK_PROOF = 447;
+const NUMBER_OF_FIELDS_IN_HONK_PROOF = 443;
 
 // We use the solcjs compiler version in this test, although it is slower than foundry, to run the test end to end
 // it simplifies of parallelising the test suite