From 50e001a74a653b0f978bb0d22da70314b1a3436a Mon Sep 17 00:00:00 2001
From: AztecBot <tech@aztecprotocol.com>
Date: Wed, 6 Mar 2024 18:44:01 +0000
Subject: [PATCH] feat(avm): storage
 (https://github.com/AztecProtocol/aztec-packages/pull/4673)

## Overview
Works around brillig blowup issue by altering the read and write opcodes
to take in arrays of data. This is potentially just a short term fix.

- Reading and writing to storage now take in arrays, code will not
compile without this change, due to an ssa issue ->[ ISSUE
](https://github.com/AztecProtocol/aztec-packages/issues/4979)

- Tag checks on memory now just make sure the tag is LESS than uint64,
rather than asserting that the memory tag is uint32, this should be
fine.

- We had to blow up the memory space of the avm to u64 as the entire
noir compiler works with u64s. Arrays will not work unless we either
    - Make the avm 64 bit addressable ( probably fine )
- Make noir 32 bit addressable ( requires alot of buy in )
https://github.com/AztecProtocol/aztec-packages/pull/4814

---------

Co-authored-by: sirasistant <sirasistant@gmail.com>
---
 .aztec-sync-commit                            |  2 +-
 aztec_macros/src/lib.rs                       |  8 ++++++-
 bootstrap.sh                                  | 22 +++++++++++++++++++
 bootstrap_cache.sh                            | 13 +++++++++++
 .../noirc_evaluator/src/brillig/brillig_ir.rs |  3 ++-
 .../Nargo.toml                                |  5 +++++
 6 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100755 bootstrap.sh
 create mode 100755 bootstrap_cache.sh
 create mode 100644 test_programs/noir_test_failure/should_fail_suite_with_one_failure/Nargo.toml

diff --git a/.aztec-sync-commit b/.aztec-sync-commit
index 6841c89b691..d26bd52af21 100644
--- a/.aztec-sync-commit
+++ b/.aztec-sync-commit
@@ -1 +1 @@
-7ff9b71d8d87fc93ae7dbd8ba63f5176b0cd17be
+bfdbf2e0cb6e5daff4178aca4c5a9b5b87f8b57d
diff --git a/aztec_macros/src/lib.rs b/aztec_macros/src/lib.rs
index f9df3f10129..012995d6ed4 100644
--- a/aztec_macros/src/lib.rs
+++ b/aztec_macros/src/lib.rs
@@ -727,8 +727,14 @@ fn transform_function(
 /// Transform a function to work with AVM bytecode
 fn transform_vm_function(
     func: &mut NoirFunction,
-    _storage_defined: bool,
+    storage_defined: bool,
 ) -> Result<(), AztecMacroError> {
+    // Create access to storage
+    if storage_defined {
+        let storage = abstract_storage("public_vm", true);
+        func.def.body.0.insert(0, storage);
+    }
+
     // Push Avm context creation to the beginning of the function
     let create_context = create_avm_context()?;
     func.def.body.0.insert(0, create_context);
diff --git a/bootstrap.sh b/bootstrap.sh
new file mode 100755
index 00000000000..54129c3d61a
--- /dev/null
+++ b/bootstrap.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -eu
+
+cd $(dirname "$0")
+
+CMD=${1:-}
+
+if [ -n "$CMD" ]; then
+  if [ "$CMD" = "clean" ]; then
+    git clean -fdx
+    exit 0
+  else
+    echo "Unknown command: $CMD"
+    exit 1
+  fi
+fi
+
+# Attempt to just pull artefacts from CI and exit on success.
+[ -n "${USE_CACHE:-}" ] && ./bootstrap_cache.sh && exit
+
+./scripts/bootstrap_native.sh
+./scripts/bootstrap_packages.sh
diff --git a/bootstrap_cache.sh b/bootstrap_cache.sh
new file mode 100755
index 00000000000..1cec6c81d8e
--- /dev/null
+++ b/bootstrap_cache.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -eu
+
+cd "$(dirname "$0")"
+source ../build-system/scripts/setup_env '' '' mainframe_$USER > /dev/null
+
+echo -e "\033[1mRetrieving noir packages from remote cache...\033[0m"
+extract_repo noir-packages /usr/src/noir/packages ./
+echo -e "\033[1mRetrieving nargo from remote cache...\033[0m"
+extract_repo noir /usr/src/noir/target/release ./target/
+
+remove_old_images noir-packages
+remove_old_images noir
diff --git a/compiler/noirc_evaluator/src/brillig/brillig_ir.rs b/compiler/noirc_evaluator/src/brillig/brillig_ir.rs
index f1a8f24ed03..662dc074d98 100644
--- a/compiler/noirc_evaluator/src/brillig/brillig_ir.rs
+++ b/compiler/noirc_evaluator/src/brillig/brillig_ir.rs
@@ -32,7 +32,7 @@ use num_bigint::BigUint;
 /// The Brillig VM does not apply a limit to the memory address space,
 /// As a convention, we take use 64 bits. This means that we assume that
 /// memory has 2^64 memory slots.
-pub(crate) const BRILLIG_MEMORY_ADDRESSING_BIT_SIZE: u32 = 32;
+pub(crate) const BRILLIG_MEMORY_ADDRESSING_BIT_SIZE: u32 = 64;
 
 // Registers reserved in runtime for special purposes.
 pub(crate) enum ReservedRegisters {
@@ -562,6 +562,7 @@ impl BrilligContext {
         bit_size: u32,
     ) {
         self.debug_show.const_instruction(result, constant);
+
         self.push_opcode(BrilligOpcode::Const { destination: result, value: constant, bit_size });
     }
 
diff --git a/test_programs/noir_test_failure/should_fail_suite_with_one_failure/Nargo.toml b/test_programs/noir_test_failure/should_fail_suite_with_one_failure/Nargo.toml
new file mode 100644
index 00000000000..3d2cf2c6096
--- /dev/null
+++ b/test_programs/noir_test_failure/should_fail_suite_with_one_failure/Nargo.toml
@@ -0,0 +1,5 @@
+[package]
+name = "should_fail_with_mismatch"
+type = "bin"
+authors = [""]
+[dependencies]