Merge branch 'master' into tf/cross-block-deduplication

Author: asterite

.github/spot-runner-action/dist/index.js

@@ -281,8 +281,8 @@ class Ec2Instance {
                             Ebs: {
                                 VolumeSize: 64,
                                 VolumeType: 'gp3',
-                                Throughput: 1000,
-                                Iops: 5000
+                                Throughput: 125,
+                                Iops: 3000
                             },
                         },
                     ],

.github/spot-runner-action/src/ec2.ts

@@ -200,8 +200,8 @@ export class Ec2Instance {
             Ebs: {
               VolumeSize: 64,
               VolumeType: 'gp3',
-              Throughput: 1000,
-              Iops: 5000
+              Throughput: 125,
+              Iops: 3000
             },
           },
         ],

.github/workflows/ci.yml

@@ -157,7 +157,7 @@ jobs:
           concurrency_key: build-x86
       # prepare images locally, tagged by commit hash
       - name: "Build E2E Image"
-        timeout-minutes: 40
+        timeout-minutes: 90
         if: (needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master'
         run: |
           earthly-ci ./yarn-project+export-e2e-test-images
@@ -208,6 +208,7 @@ jobs:
         uses: ./.github/ensure-tester-with-images
         env:
           USERNAME: ${{ needs.configure.outputs.username }}
+          PULL_REQUEST: ${{ github.event.pull_request.number }}
         with:
           runner_type: ${{ steps.runner_type.outputs.type }}
           builder_type: builder-x86

.gitignore

@@ -25,8 +25,6 @@ terraform.tfstate*
 .secret
 .bb_tmp
 
-# Terraform
-*.tfvars
 
 # tmux
 tmux-client-*.log

.release-please-manifest.json

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

CHANGELOG.md

@@ -11,7 +11,6 @@ license = "MIT OR Apache-2.0"
 # local
 acvm = { path = "../noir/noir-repo/acvm-repo/acvm", features = ["bn254"] }
 noirc_errors = { path = "../noir/noir-repo/compiler/noirc_errors" }
-fxhash = "0.2.1"
 
 # external
 base64 = "0.21"

avm-transpiler/Cargo.lock

@@ -5,11 +5,50 @@ This component transpiles Aztec public contracts code from Noir's Brillig byteco
 ## Build
 
 ```
-./boostrap.sh
+./bootstrap.sh
 ```
 
 ## Run
 
 ```
 cargo run <aztec-contract-artifact-json> <transpiled-output-json>
 ```
+
+## Testing Transpiler Changes
+
+After bootstrap in `avm-transpiler`, go to `noir-contracts` and only compile avm_test_contract with:
+
+```
+nargo compile --package avm_test_contract --inliner-aggressiveness=0 --silence-warnings
+```
+
+Important: use the right nargo binary located in
+`aztec-packages/noir/noir-repo/target/release/nargo`
+If required, build nargo by going in `noir/noir-repo` and run
+`cargo build --release`.
+
+Then, transpile it:
+
+```
+scripts/transpile.sh
+```
+
+Go to yarn-project/simulator and run:
+
+```
+yarn build:fast
+```
+
+This takes in the TS generated by the compilation and transpilation.
+
+Finally, run
+
+```
+yarn test src/avm/avm_simulator.test.ts
+```
+
+To test against some .cpp changes, compile the bb binary and run bb prover test:
+
+```
+yarn test src/avm_proving.test.ts
+```

avm-transpiler/Cargo.toml

@@ -22,8 +22,12 @@ pub struct AvmInstruction {
     /// Its usage will depend on the instruction.
     pub tag: Option<AvmTypeTag>,
 
-    /// Different instructions have different numbers of operands
+    /// Different instructions have different numbers of operands. These operands contain
+    /// memory addresses.
     pub operands: Vec<AvmOperand>,
+
+    // Operands which are immediate, i.e., contain hardcoded constants.
+    pub immediates: Vec<AvmOperand>,
 }
 
 impl Display for AvmInstruction {
@@ -32,35 +36,46 @@ impl Display for AvmInstruction {
         if let Some(indirect) = &self.indirect {
             write!(f, ", indirect: {}", indirect)?;
         }
-        // This will be either inTag or dstTag depending on the operation
-        if let Some(dst_tag) = self.tag {
-            write!(f, ", tag: {}", dst_tag as u8)?;
-        }
         if !self.operands.is_empty() {
             write!(f, ", operands: [")?;
             for operand in &self.operands {
                 write!(f, "{operand}, ")?;
             }
             write!(f, "]")?;
         };
+        // This will be either inTag or dstTag depending on the operation
+        if let Some(dst_tag) = self.tag {
+            write!(f, ", tag: {}", dst_tag as u8)?;
+        }
+        if !self.immediates.is_empty() {
+            write!(f, ", immediates: [")?;
+            for immediate in &self.immediates {
+                write!(f, "{immediate}, ")?;
+            }
+            write!(f, "]")?;
+        };
         Ok(())
     }
 }
 
 impl AvmInstruction {
     /// Bytes representation for generating AVM bytecode
+    /// Order: INDIRECT, OPERANDS, TAG, IMMEDIATES
     pub fn to_bytes(&self) -> Vec<u8> {
         let mut bytes = Vec::new();
         bytes.push(self.opcode as u8);
         if let Some(indirect) = &self.indirect {
             bytes.extend_from_slice(&indirect.to_be_bytes());
         }
+        for operand in &self.operands {
+            bytes.extend_from_slice(&operand.to_be_bytes());
+        }
         // This will be either inTag or dstTag depending on the operation
         if let Some(tag) = self.tag {
             bytes.extend_from_slice(&(tag as u8).to_be_bytes());
         }
-        for operand in &self.operands {
-            bytes.extend_from_slice(&operand.to_be_bytes());
+        for immediate in &self.immediates {
+            bytes.extend_from_slice(&immediate.to_be_bytes());
         }
         bytes
     }
@@ -84,6 +99,7 @@ impl Default for AvmInstruction {
             indirect: None,
             tag: None,
             operands: vec![],
+            immediates: vec![],
         }
     }
 }
@@ -102,9 +118,8 @@ pub enum AvmTypeTag {
     INVALID,
 }
 
-/// Operands are usually 32 bits (offsets or jump destinations)
-/// Constants (as used by the SET instruction) can have size
-/// different from 32 bits
+/// Operands are usually 8, 16 and 32 bits (offsets)
+/// Immediates (as used by the SET instruction) can have different sizes
 #[allow(non_camel_case_types)]
 pub enum AvmOperand {
     U8 { value: u8 },